Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b2ba0db authored by Jouni Malinen's avatar Jouni Malinen Committed by Johannes Berg
Browse files

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: default avatarJouni Malinen <jouni@qca.qualcomm.com>
[squash ccmp256 -> mic_len argument change]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 00b9cfa3

net/mac80211/aes_ccm.c

+12 −9
Original line number Diff line number Diff line
@@ -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;

net/mac80211/aes_ccm.h

+7 −3
Original line number Diff line number Diff line
@@ -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 */

net/mac80211/cfg.c

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
			return -EINVAL;

		break;

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

	case WLAN_CIPHER_SUITE_AES_CMAC:

	case WLAN_CIPHER_SUITE_GCMP:

	case WLAN_CIPHER_SUITE_GCMP_256:
@@ -349,6 +350,7 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev, 
		params.seq_len = 6;

		break;

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

		pn64 = atomic64_read(&key->u.ccmp.tx_pn);

		seq[0] = pn64;

		seq[1] = pn64 >> 8;

net/mac80211/debugfs_key.c

+3 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static ssize_t key_tx_spec_read(struct file *file, char __user *userbuf, 
				key->u.tkip.tx.iv16);

		break;

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

		pn = atomic64_read(&key->u.ccmp.tx_pn);

		len = scnprintf(buf, sizeof(buf), "%02x%02x%02x%02x%02x%02x\n",

				(u8)(pn >> 40), (u8)(pn >> 32), (u8)(pn >> 24),
@@ -141,6 +142,7 @@ static ssize_t key_rx_spec_read(struct file *file, char __user *userbuf, 
		len = p - buf;

		break;

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

		for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++) {

			rpn = key->u.ccmp.rx_pn[i];

			p += scnprintf(p, sizeof(buf)+buf-p,
@@ -185,6 +187,7 @@ static ssize_t key_replays_read(struct file *file, char __user *userbuf, 


	switch (key->conf.cipher) {

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

		len = scnprintf(buf, sizeof(buf), "%u\n", key->u.ccmp.replays);

		break;

	case WLAN_CIPHER_SUITE_AES_CMAC:

net/mac80211/key.c

+26 −1
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key) 
	case WLAN_CIPHER_SUITE_WEP104:

	case WLAN_CIPHER_SUITE_TKIP:

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

	case WLAN_CIPHER_SUITE_AES_CMAC:

	case WLAN_CIPHER_SUITE_GCMP:

	case WLAN_CIPHER_SUITE_GCMP_256:
@@ -389,7 +390,26 @@ ieee80211_key_alloc(u32 cipher, int idx, size_t key_len, 
		 * Initialize AES key state here as an optimization so that

		 * it does not need to be initialized for every packet.

		 */

		key->u.ccmp.tfm = ieee80211_aes_key_setup_encrypt(key_data);

		key->u.ccmp.tfm = ieee80211_aes_key_setup_encrypt(

			key_data, key_len, IEEE80211_CCMP_MIC_LEN);

		if (IS_ERR(key->u.ccmp.tfm)) {

			err = PTR_ERR(key->u.ccmp.tfm);

			kfree(key);

			return ERR_PTR(err);

		}

		break;

	case WLAN_CIPHER_SUITE_CCMP_256:

		key->conf.iv_len = IEEE80211_CCMP_256_HDR_LEN;

		key->conf.icv_len = IEEE80211_CCMP_256_MIC_LEN;

		for (i = 0; seq && i < IEEE80211_NUM_TIDS + 1; i++)

			for (j = 0; j < IEEE80211_CCMP_256_PN_LEN; j++)

				key->u.ccmp.rx_pn[i][j] =

					seq[IEEE80211_CCMP_256_PN_LEN - j - 1];

		/* Initialize AES key state here as an optimization so that

		 * it does not need to be initialized for every packet.

		 */

		key->u.ccmp.tfm = ieee80211_aes_key_setup_encrypt(

			key_data, key_len, IEEE80211_CCMP_256_MIC_LEN);

		if (IS_ERR(key->u.ccmp.tfm)) {

			err = PTR_ERR(key->u.ccmp.tfm);

			kfree(key);
@@ -457,6 +477,7 @@ static void ieee80211_key_free_common(struct ieee80211_key *key) 
{

	switch (key->conf.cipher) {

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

		ieee80211_aes_key_free(key->u.ccmp.tfm);

		break;

	case WLAN_CIPHER_SUITE_AES_CMAC:
@@ -773,6 +794,7 @@ void ieee80211_get_key_tx_seq(struct ieee80211_key_conf *keyconf, 
		seq->tkip.iv16 = key->u.tkip.tx.iv16;

		break;

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

		pn64 = atomic64_read(&key->u.ccmp.tx_pn);

		seq->ccmp.pn[5] = pn64;

		seq->ccmp.pn[4] = pn64 >> 8;
@@ -822,6 +844,7 @@ void ieee80211_get_key_rx_seq(struct ieee80211_key_conf *keyconf, 
		seq->tkip.iv16 = key->u.tkip.rx[tid].iv16;

		break;

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

		if (WARN_ON(tid < -1 || tid >= IEEE80211_NUM_TIDS))

			return;

		if (tid < 0)
@@ -864,6 +887,7 @@ void ieee80211_set_key_tx_seq(struct ieee80211_key_conf *keyconf, 
		key->u.tkip.tx.iv16 = seq->tkip.iv16;

		break;

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

		pn64 = (u64)seq->ccmp.pn[5] |

		       ((u64)seq->ccmp.pn[4] << 8) |

		       ((u64)seq->ccmp.pn[3] << 16) |
@@ -914,6 +938,7 @@ void ieee80211_set_key_rx_seq(struct ieee80211_key_conf *keyconf, 
		key->u.tkip.rx[tid].iv16 = seq->tkip.iv16;

		break;

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

		if (WARN_ON(tid < -1 || tid >= IEEE80211_NUM_TIDS))

			return;

		if (tid < 0)