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>

1 files changed, 12 insertions, 9 deletions

diff --git a/net/mac80211/aes_ccm.c b/net/mac80211/aes_ccm.c
index 09d9caaec591..7869bb40acaa 100644
--- a/net/mac80211/aes_ccm.c
+++ b/net/mac80211/aes_ccm.c
@@ -20,7 +20,8 @@
 #include "aes_ccm.h"
 
 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)
 {
         struct scatterlist assoc, pt, ct[2];
 
@@ -35,7 +36,7 @@ void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
         sg_init_one(&assoc, &aad[2], be16_to_cpup((__be16 *)aad));
         sg_init_table(ct, 2);
         sg_set_buf(&ct[0], data, data_len);
-        sg_set_buf(&ct[1], mic, IEEE80211_CCMP_MIC_LEN);
+        sg_set_buf(&ct[1], mic, mic_len);
 
         aead_request_set_tfm(aead_req, tfm);
         aead_request_set_assoc(aead_req, &assoc, assoc.length);
@@ -45,7 +46,8 @@ void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
 }
 
 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)
 {
         struct scatterlist assoc, pt, ct[2];
         char aead_req_data[sizeof(struct aead_request) +
@@ -62,17 +64,18 @@ int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
         sg_init_one(&assoc, &aad[2], be16_to_cpup((__be16 *)aad));
         sg_init_table(ct, 2);
         sg_set_buf(&ct[0], data, data_len);
-        sg_set_buf(&ct[1], mic, IEEE80211_CCMP_MIC_LEN);
+        sg_set_buf(&ct[1], mic, mic_len);
 
         aead_request_set_tfm(aead_req, tfm);
         aead_request_set_assoc(aead_req, &assoc, assoc.length);
-        aead_request_set_crypt(aead_req, ct, &pt,
-                               data_len + IEEE80211_CCMP_MIC_LEN, b_0);
+        aead_request_set_crypt(aead_req, ct, &pt, data_len + mic_len, b_0);
 
         return crypto_aead_decrypt(aead_req);
 }
 
-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)
 {
         struct crypto_aead *tfm;
         int err;
@@ -81,9 +84,9 @@ struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[])
         if (IS_ERR(tfm))
                 return tfm;
 
-        err = crypto_aead_setkey(tfm, key, WLAN_KEY_LEN_CCMP);
+        err = crypto_aead_setkey(tfm, key, key_len);
         if (!err)
-                err = crypto_aead_setauthsize(tfm, IEEE80211_CCMP_MIC_LEN);
+                err = crypto_aead_setauthsize(tfm, mic_len);
         if (!err)
                 return tfm;