summaryrefslogtreecommitdiffstats
path: root/net/mac80211/aes_ccm.h
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2013-10-10 09:55:20 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-10-11 15:38:20 +0200
commit7ec7c4a9a686c608315739ab6a2b0527a240883c (patch)
treee3f5ecc10414b632be93bef3f4e0494733113795 /net/mac80211/aes_ccm.h
parentfa1fb9cb1c734204018d2b4e6f38c4a9b4146612 (diff)
downloadlinux-stable-7ec7c4a9a686c608315739ab6a2b0527a240883c.tar.gz
linux-stable-7ec7c4a9a686c608315739ab6a2b0527a240883c.tar.bz2
linux-stable-7ec7c4a9a686c608315739ab6a2b0527a240883c.zip
mac80211: port CCMP to cryptoapi's CCM driver
Use the generic CCM aead chaining mode driver rather than a local implementation that sits right on top of the core AES cipher. This allows the use of accelerated implementations of either CCM as a whole or the CTR mode which it encapsulates. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/aes_ccm.h')
-rw-r--r--net/mac80211/aes_ccm.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/net/mac80211/aes_ccm.h b/net/mac80211/aes_ccm.h
index 5b7d744e2370..2c7ab1948a2e 100644
--- a/net/mac80211/aes_ccm.h
+++ b/net/mac80211/aes_ccm.h
@@ -12,13 +12,11 @@
#include <linux/crypto.h>
-struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[]);
-void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
- u8 *data, size_t data_len,
- u8 *cdata, u8 *mic);
-int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch,
- u8 *cdata, size_t data_len,
- u8 *mic, u8 *data);
-void ieee80211_aes_key_free(struct crypto_cipher *tfm);
+struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[]);
+void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+ u8 *data, size_t data_len, u8 *mic);
+int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+ u8 *data, size_t data_len, u8 *mic);
+void ieee80211_aes_key_free(struct crypto_aead *tfm);
#endif /* AES_CCM_H */