Commit 00b9cfa3 authored by Jouni Malinen's avatar Jouni Malinen Committed by Johannes Berg
Browse files

mac80111: Add GCMP and GCMP-256 ciphers 



This allows mac80211 to configure GCMP and GCMP-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>
[remove a spurious newline]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent cfcf1682

include/net/mac80211.h

+10 −5
Original line number Diff line number Diff line
@@ -1294,8 +1294,8 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev); 
 * @IEEE80211_KEY_FLAG_PAIRWISE: Set by mac80211, this flag indicates

 *	that the key is pairwise rather then a shared key.

 * @IEEE80211_KEY_FLAG_SW_MGMT_TX: This flag should be set by the driver for a

 *	CCMP key if it requires CCMP encryption of management frames (MFP) to

 *	be done in software.

 *	CCMP/GCMP key if it requires CCMP/GCMP encryption of management frames

 *	(MFP) to be done in software.

 * @IEEE80211_KEY_FLAG_PUT_IV_SPACE: This flag should be set by the driver

 *	if space should be prepared for the IV, but the IV

 *	itself should not be generated. Do not set together with
@@ -1310,7 +1310,7 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev); 
 *	RX, if your crypto engine can't deal with TX you can also set the

 *	%IEEE80211_KEY_FLAG_SW_MGMT_TX flag to encrypt such frames in SW.

 * @IEEE80211_KEY_FLAG_GENERATE_IV_MGMT: This flag should be set by the

 *	driver for a CCMP key to indicate that is requires IV generation

 *	driver for a CCMP/GCMP key to indicate that is requires IV generation

 *	only for managment frames (MFP).

 * @IEEE80211_KEY_FLAG_RESERVE_TAILROOM: This flag should be set by the

 *	driver for a key to indicate that sufficient tailroom must always
@@ -4098,6 +4098,8 @@ void ieee80211_aes_cmac_calculate_k1_k2(struct ieee80211_key_conf *keyconf, 
 *	reverse order than in packet)

 * @aes_cmac: PN data, most significant byte first (big endian,

 *	reverse order than in packet)

 * @gcmp: PN data, most significant byte first (big endian,

 *	reverse order than in packet)

 */

struct ieee80211_key_seq {

	union {
@@ -4111,6 +4113,9 @@ struct ieee80211_key_seq { 
		struct {

			u8 pn[6];

		} aes_cmac;

		struct {

			u8 pn[6];

		} gcmp;

	};

};
@@ -4135,7 +4140,7 @@ void ieee80211_get_key_tx_seq(struct ieee80211_key_conf *keyconf, 
 * ieee80211_get_key_rx_seq - get key RX sequence counter

 *

 * @keyconf: the parameter passed with the set key

 * @tid: The TID, or -1 for the management frame value (CCMP only);

 * @tid: The TID, or -1 for the management frame value (CCMP/GCMP only);

 *	the value on TID 0 is also used for non-QoS frames. For

 *	CMAC, only TID 0 is valid.

 * @seq: buffer to receive the sequence data
@@ -4171,7 +4176,7 @@ void ieee80211_set_key_tx_seq(struct ieee80211_key_conf *keyconf, 
 * ieee80211_set_key_rx_seq - set key RX sequence counter

 *

 * @keyconf: the parameter passed with the set key

 * @tid: The TID, or -1 for the management frame value (CCMP only);

 * @tid: The TID, or -1 for the management frame value (CCMP/GCMP only);

 *	the value on TID 0 is also used for non-QoS frames. For

 *	CMAC, only TID 0 is valid.

 * @seq: new sequence data

net/mac80211/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config MAC80211 
	select CRYPTO_ARC4

	select CRYPTO_AES

	select CRYPTO_CCM

	select CRYPTO_GCM

	select CRC32

	select AVERAGE

	---help---

net/mac80211/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ mac80211-y := \ 
	michael.o \

	tkip.o \

	aes_ccm.o \

	aes_gcm.o \

	aes_cmac.o \

	cfg.o \

	ethtool.o \

net/mac80211/aes_gcm.c

0 → 100644
+95 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2014-2015, Qualcomm Atheros, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/crypto.h>

#include <linux/err.h>

#include <crypto/aes.h>



#include <net/mac80211.h>

#include "key.h"

#include "aes_gcm.h"



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];



	char aead_req_data[sizeof(struct aead_request) +

			   crypto_aead_reqsize(tfm)]

		__aligned(__alignof__(struct aead_request));

	struct aead_request *aead_req = (void *)aead_req_data;



	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);



	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);



	crypto_aead_encrypt(aead_req);

}



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];

	char aead_req_data[sizeof(struct aead_request) +

			   crypto_aead_reqsize(tfm)]

		__aligned(__alignof__(struct aead_request));

	struct aead_request *aead_req = (void *)aead_req_data;



	if (data_len == 0)

		return -EINVAL;



	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);



	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_GCMP_MIC_LEN, j_0);



	return crypto_aead_decrypt(aead_req);

}



struct crypto_aead *ieee80211_aes_gcm_key_setup_encrypt(const u8 key[],

							size_t key_len)

{

	struct crypto_aead *tfm;

	int err;



	tfm = crypto_alloc_aead("gcm(aes)", 0, CRYPTO_ALG_ASYNC);

	if (IS_ERR(tfm))

		return tfm;



	err = crypto_aead_setkey(tfm, key, key_len);

	if (!err)

		err = crypto_aead_setauthsize(tfm, IEEE80211_GCMP_MIC_LEN);

	if (!err)

		return tfm;



	crypto_free_aead(tfm);

	return ERR_PTR(err);

}



void ieee80211_aes_gcm_key_free(struct crypto_aead *tfm)

{

	crypto_free_aead(tfm);

}

net/mac80211/aes_gcm.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2014-2015, Qualcomm Atheros, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef AES_GCM_H

#define AES_GCM_H



#include <linux/crypto.h>



void ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,

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

int ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,

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

struct crypto_aead *ieee80211_aes_gcm_key_setup_encrypt(const u8 key[],

							size_t key_len);

void ieee80211_aes_gcm_key_free(struct crypto_aead *tfm);



#endif /* AES_GCM_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE