diff options
author | Jouni Malinen <jouni@qca.qualcomm.com> | 2015-01-24 19:52:07 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-27 11:07:35 +0100 |
commit | 2b2ba0db1c820d04d5143452d70012cd44d7b578 (patch) | |
tree | 7c186fc249d191d9ecba66e740e7a4c922a986d5 /net/mac80211/aes_ccm.h | |
parent | 00b9cfa3ff38401bd70c34b250ca13e5ea347b4a (diff) | |
download | op-kernel-dev-2b2ba0db1c820d04d5143452d70012cd44d7b578.zip op-kernel-dev-2b2ba0db1c820d04d5143452d70012cd44d7b578.tar.gz |
mac80111: Add CCMP-256 cipher
This allows mac80211 to configure CCMP-256 to the driver and also use
software-implementation within mac80211 when the driver does not support
this with hardware accelaration.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
[squash ccmp256 -> mic_len argument change]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/aes_ccm.h')
-rw-r--r-- | net/mac80211/aes_ccm.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/mac80211/aes_ccm.h b/net/mac80211/aes_ccm.h index 2c7ab19..6a73d1e 100644 --- a/net/mac80211/aes_ccm.h +++ b/net/mac80211/aes_ccm.h @@ -12,11 +12,15 @@ #include <linux/crypto.h> -struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[]); +struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[], + size_t key_len, + size_t mic_len); void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, - u8 *data, size_t data_len, u8 *mic); + u8 *data, size_t data_len, u8 *mic, + size_t mic_len); int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, - u8 *data, size_t data_len, u8 *mic); + u8 *data, size_t data_len, u8 *mic, + size_t mic_len); void ieee80211_aes_key_free(struct crypto_aead *tfm); #endif /* AES_CCM_H */ |