|
@@ -43,122 +43,118 @@
|
|
|
- struct aead_request *aead_req;
|
|
|
- int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
|
|
|
- u8 *__aad;
|
|
|
--
|
|
|
++ int i;
|
|
|
+
|
|
|
- aead_req = kzalloc(reqsize + CCM_AAD_LEN, GFP_ATOMIC);
|
|
|
- if (!aead_req)
|
|
|
- return -ENOMEM;
|
|
|
--
|
|
|
++ crypto_cipher_encrypt_one(tfm, b, b_0);
|
|
|
+
|
|
|
- __aad = (u8 *)aead_req + reqsize;
|
|
|
- memcpy(__aad, aad, CCM_AAD_LEN);
|
|
|
--
|
|
|
++ /* Extra Authenticate-only data (always two AES blocks) */
|
|
|
++ for (i = 0; i < AES_BLOCK_SIZE; i++)
|
|
|
++ aad[i] ^= b[i];
|
|
|
++ crypto_cipher_encrypt_one(tfm, b, aad);
|
|
|
+
|
|
|
- sg_init_table(sg, 3);
|
|
|
- sg_set_buf(&sg[0], &__aad[2], be16_to_cpup((__be16 *)__aad));
|
|
|
- sg_set_buf(&sg[1], data, data_len);
|
|
|
- sg_set_buf(&sg[2], mic, mic_len);
|
|
|
--
|
|
|
++ aad += AES_BLOCK_SIZE;
|
|
|
+
|
|
|
- aead_request_set_tfm(aead_req, tfm);
|
|
|
- aead_request_set_crypt(aead_req, sg, sg, data_len, b_0);
|
|
|
- aead_request_set_ad(aead_req, sg[0].length);
|
|
|
-+ int i;
|
|
|
-
|
|
|
-- crypto_aead_encrypt(aead_req);
|
|
|
-- kzfree(aead_req);
|
|
|
-+ crypto_cipher_encrypt_one(tfm, b, b_0);
|
|
|
-
|
|
|
-- return 0;
|
|
|
-+ /* Extra Authenticate-only data (always two AES blocks) */
|
|
|
-+ for (i = 0; i < AES_BLOCK_SIZE; i++)
|
|
|
-+ aad[i] ^= b[i];
|
|
|
-+ crypto_cipher_encrypt_one(tfm, b, aad);
|
|
|
-+
|
|
|
-+ aad += AES_BLOCK_SIZE;
|
|
|
-+
|
|
|
+ for (i = 0; i < AES_BLOCK_SIZE; i++)
|
|
|
+ aad[i] ^= b[i];
|
|
|
+ crypto_cipher_encrypt_one(tfm, a, aad);
|
|
|
-+
|
|
|
+
|
|
|
+- crypto_aead_encrypt(aead_req);
|
|
|
+- kzfree(aead_req);
|
|
|
+ /* Mask out bits from auth-only-b_0 */
|
|
|
+ b_0[0] &= 0x07;
|
|
|
-+
|
|
|
+
|
|
|
+- return 0;
|
|
|
+ /* S_0 is used to encrypt T (= MIC) */
|
|
|
+ b_0[14] = 0;
|
|
|
+ b_0[15] = 0;
|
|
|
+ crypto_cipher_encrypt_one(tfm, s_0, b_0);
|
|
|
-+}
|
|
|
-+
|
|
|
+ }
|
|
|
+
|
|
|
+-int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
|
|
|
+- u8 *data, size_t data_len, u8 *mic,
|
|
|
+- size_t mic_len)
|
|
|
+
|
|
|
+void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
|
|
|
+ u8 *data, size_t data_len, u8 *mic,
|
|
|
+ size_t mic_len)
|
|
|
-+{
|
|
|
+ {
|
|
|
+- struct scatterlist sg[3];
|
|
|
+- struct aead_request *aead_req;
|
|
|
+- int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
|
|
|
+- u8 *__aad;
|
|
|
+- int err;
|
|
|
+ int i, j, last_len, num_blocks;
|
|
|
+ u8 b[AES_BLOCK_SIZE];
|
|
|
+ u8 s_0[AES_BLOCK_SIZE];
|
|
|
+ u8 e[AES_BLOCK_SIZE];
|
|
|
+ u8 *pos, *cpos;
|
|
|
-+
|
|
|
+
|
|
|
+- if (data_len == 0)
|
|
|
+- return -EINVAL;
|
|
|
+ num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
|
|
|
+ last_len = data_len % AES_BLOCK_SIZE;
|
|
|
+ aes_ccm_prepare(tfm, b_0, aad, s_0, b, b);
|
|
|
-+
|
|
|
+
|
|
|
+- aead_req = kzalloc(reqsize + CCM_AAD_LEN, GFP_ATOMIC);
|
|
|
+- if (!aead_req)
|
|
|
+- return -ENOMEM;
|
|
|
+ /* Process payload blocks */
|
|
|
+ pos = data;
|
|
|
+ cpos = data;
|
|
|
+ for (j = 1; j <= num_blocks; j++) {
|
|
|
+ int blen = (j == num_blocks && last_len) ?
|
|
|
+ last_len : AES_BLOCK_SIZE;
|
|
|
-+
|
|
|
+
|
|
|
+- __aad = (u8 *)aead_req + reqsize;
|
|
|
+- memcpy(__aad, aad, CCM_AAD_LEN);
|
|
|
+ /* Authentication followed by encryption */
|
|
|
+ for (i = 0; i < blen; i++)
|
|
|
+ b[i] ^= pos[i];
|
|
|
+ crypto_cipher_encrypt_one(tfm, b, b);
|
|
|
-+
|
|
|
+
|
|
|
+- sg_init_table(sg, 3);
|
|
|
+- sg_set_buf(&sg[0], &__aad[2], be16_to_cpup((__be16 *)__aad));
|
|
|
+- sg_set_buf(&sg[1], data, data_len);
|
|
|
+- sg_set_buf(&sg[2], mic, mic_len);
|
|
|
+ b_0[14] = (j >> 8) & 0xff;
|
|
|
+ b_0[15] = j & 0xff;
|
|
|
+ crypto_cipher_encrypt_one(tfm, e, b_0);
|
|
|
+ for (i = 0; i < blen; i++)
|
|
|
+ *cpos++ = *pos++ ^ e[i];
|
|
|
+ }
|
|
|
-+
|
|
|
-+ for (i = 0; i < mic_len; i++)
|
|
|
-+ mic[i] = b[i] ^ s_0[i];
|
|
|
- }
|
|
|
|
|
|
--int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
|
|
|
-+int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
|
|
|
- u8 *data, size_t data_len, u8 *mic,
|
|
|
- size_t mic_len)
|
|
|
- {
|
|
|
-- struct scatterlist sg[3];
|
|
|
-- struct aead_request *aead_req;
|
|
|
-- int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
|
|
|
-- u8 *__aad;
|
|
|
-- int err;
|
|
|
--
|
|
|
-- if (data_len == 0)
|
|
|
-- return -EINVAL;
|
|
|
--
|
|
|
-- aead_req = kzalloc(reqsize + CCM_AAD_LEN, GFP_ATOMIC);
|
|
|
-- if (!aead_req)
|
|
|
-- return -ENOMEM;
|
|
|
--
|
|
|
-- __aad = (u8 *)aead_req + reqsize;
|
|
|
-- memcpy(__aad, aad, CCM_AAD_LEN);
|
|
|
--
|
|
|
-- sg_init_table(sg, 3);
|
|
|
-- sg_set_buf(&sg[0], &__aad[2], be16_to_cpup((__be16 *)__aad));
|
|
|
-- sg_set_buf(&sg[1], data, data_len);
|
|
|
-- sg_set_buf(&sg[2], mic, mic_len);
|
|
|
--
|
|
|
- aead_request_set_tfm(aead_req, tfm);
|
|
|
- aead_request_set_crypt(aead_req, sg, sg, data_len + mic_len, b_0);
|
|
|
- aead_request_set_ad(aead_req, sg[0].length);
|
|
|
++ for (i = 0; i < mic_len; i++)
|
|
|
++ mic[i] = b[i] ^ s_0[i];
|
|
|
++}
|
|
|
+
|
|
|
+- err = crypto_aead_decrypt(aead_req);
|
|
|
+- kzfree(aead_req);
|
|
|
++int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
|
|
|
++ u8 *data, size_t data_len, u8 *mic,
|
|
|
++ size_t mic_len)
|
|
|
++{
|
|
|
+ int i, j, last_len, num_blocks;
|
|
|
+ u8 *pos, *cpos;
|
|
|
+ u8 a[AES_BLOCK_SIZE];
|
|
|
+ u8 b[AES_BLOCK_SIZE];
|
|
|
+ u8 s_0[AES_BLOCK_SIZE];
|
|
|
-+
|
|
|
+
|
|
|
+- return err;
|
|
|
+ num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
|
|
|
+ last_len = data_len % AES_BLOCK_SIZE;
|
|
|
+ aes_ccm_prepare(tfm, b_0, aad, s_0, a, b);
|
|
@@ -185,11 +181,7 @@
|
|
|
+ if ((mic[i] ^ s_0[i]) != a[i])
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
-
|
|
|
-- err = crypto_aead_decrypt(aead_req);
|
|
|
-- kzfree(aead_req);
|
|
|
--
|
|
|
-- return err;
|
|
|
++
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
@@ -202,12 +194,12 @@
|
|
|
{
|
|
|
- struct crypto_aead *tfm;
|
|
|
- int err;
|
|
|
-+ struct crypto_cipher *tfm;
|
|
|
-
|
|
|
+-
|
|
|
- tfm = crypto_alloc_aead("ccm(aes)", 0, CRYPTO_ALG_ASYNC);
|
|
|
- if (IS_ERR(tfm))
|
|
|
- return tfm;
|
|
|
--
|
|
|
++ struct crypto_cipher *tfm;
|
|
|
+
|
|
|
- err = crypto_aead_setkey(tfm, key, key_len);
|
|
|
- if (err)
|
|
|
- goto free_aead;
|