Commit 957e0fe6 authored by Herbert Xu's avatar Herbert Xu
Browse files

mac80211: Switch to new AEAD interface 



This patch makes use of the new AEAD interface which uses a single
SG list instead of separate lists for the AD and plain text.

Tested-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 25528fda

net/mac80211/aes_ccm.c

+14 −16
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, 
			       u8 *data, size_t data_len, u8 *mic,

			       size_t mic_len)

{

	struct scatterlist assoc, pt, ct[2];

	struct scatterlist sg[3];



	char aead_req_data[sizeof(struct aead_request) +

			   crypto_aead_reqsize(tfm)]
@@ -31,15 +31,14 @@ void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, 


	memset(aead_req, 0, sizeof(aead_req_data));



	sg_init_one(&pt, data, data_len);

	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, mic_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_assoc(aead_req, &assoc, assoc.length);

	aead_request_set_crypt(aead_req, &pt, ct, data_len, b_0);

	aead_request_set_crypt(aead_req, sg, sg, data_len, b_0);

	aead_request_set_ad(aead_req, sg[0].length);



	crypto_aead_encrypt(aead_req);

}
@@ -48,7 +47,7 @@ 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)

{

	struct scatterlist assoc, pt, ct[2];

	struct scatterlist sg[3];

	char aead_req_data[sizeof(struct aead_request) +

			   crypto_aead_reqsize(tfm)]

		__aligned(__alignof__(struct aead_request));
@@ -59,15 +58,14 @@ int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, 


	memset(aead_req, 0, sizeof(aead_req_data));



	sg_init_one(&pt, data, data_len);

	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, mic_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_assoc(aead_req, &assoc, assoc.length);

	aead_request_set_crypt(aead_req, ct, &pt, data_len + mic_len, b_0);

	aead_request_set_crypt(aead_req, sg, sg, data_len + mic_len, b_0);

	aead_request_set_ad(aead_req, sg[0].length);



	return crypto_aead_decrypt(aead_req);

}

net/mac80211/aes_gcm.c

+14 −16
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
void ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,

			       u8 *data, size_t data_len, u8 *mic)

{

	struct scatterlist assoc, pt, ct[2];

	struct scatterlist sg[3];



	char aead_req_data[sizeof(struct aead_request) +

			   crypto_aead_reqsize(tfm)]
@@ -27,15 +27,14 @@ void ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad, 


	memset(aead_req, 0, sizeof(aead_req_data));



	sg_init_one(&pt, data, data_len);

	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_GCMP_MIC_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, IEEE80211_GCMP_MIC_LEN);



	aead_request_set_tfm(aead_req, tfm);

	aead_request_set_assoc(aead_req, &assoc, assoc.length);

	aead_request_set_crypt(aead_req, &pt, ct, data_len, j_0);

	aead_request_set_crypt(aead_req, sg, sg, data_len, j_0);

	aead_request_set_ad(aead_req, sg[0].length);



	crypto_aead_encrypt(aead_req);

}
@@ -43,7 +42,7 @@ void ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad, 
int ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,

			      u8 *data, size_t data_len, u8 *mic)

{

	struct scatterlist assoc, pt, ct[2];

	struct scatterlist sg[3];

	char aead_req_data[sizeof(struct aead_request) +

			   crypto_aead_reqsize(tfm)]

		__aligned(__alignof__(struct aead_request));
@@ -54,16 +53,15 @@ int ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad, 


	memset(aead_req, 0, sizeof(aead_req_data));



	sg_init_one(&pt, data, data_len);

	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_GCMP_MIC_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, IEEE80211_GCMP_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,

	aead_request_set_crypt(aead_req, sg, sg,

			       data_len + IEEE80211_GCMP_MIC_LEN, j_0);

	aead_request_set_ad(aead_req, sg[0].length);



	return crypto_aead_decrypt(aead_req);

}

net/mac80211/aes_gmac.c

+5 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
int ieee80211_aes_gmac(struct crypto_aead *tfm, const u8 *aad, u8 *nonce,

		       const u8 *data, size_t data_len, u8 *mic)

{

	struct scatterlist sg[3], ct[1];

	struct scatterlist sg[4];

	char aead_req_data[sizeof(struct aead_request) +

			   crypto_aead_reqsize(tfm)]

		__aligned(__alignof__(struct aead_request));
@@ -37,21 +37,19 @@ int ieee80211_aes_gmac(struct crypto_aead *tfm, const u8 *aad, u8 *nonce, 
	memset(aead_req, 0, sizeof(aead_req_data));



	memset(zero, 0, GMAC_MIC_LEN);

	sg_init_table(sg, 3);

	sg_init_table(sg, 4);

	sg_set_buf(&sg[0], aad, AAD_LEN);

	sg_set_buf(&sg[1], data, data_len - GMAC_MIC_LEN);

	sg_set_buf(&sg[2], zero, GMAC_MIC_LEN);

	sg_set_buf(&sg[3], mic, GMAC_MIC_LEN);



	memcpy(iv, nonce, GMAC_NONCE_LEN);

	memset(iv + GMAC_NONCE_LEN, 0, sizeof(iv) - GMAC_NONCE_LEN);

	iv[AES_BLOCK_SIZE - 1] = 0x01;



	sg_init_table(ct, 1);

	sg_set_buf(&ct[0], mic, GMAC_MIC_LEN);



	aead_request_set_tfm(aead_req, tfm);

	aead_request_set_assoc(aead_req, sg, AAD_LEN + data_len);

	aead_request_set_crypt(aead_req, NULL, ct, 0, iv);

	aead_request_set_crypt(aead_req, sg, sg, 0, iv);

	aead_request_set_ad(aead_req, AAD_LEN + data_len);



	crypto_aead_encrypt(aead_req);