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

Commit 8ade538b authored by Jouni Malinen's avatar Jouni Malinen Committed by Johannes Berg
Browse files

mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers 



This allows mac80211 to configure BIP-GMAC-128 and BIP-GMAC-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>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 56c52da2

include/net/mac80211.h

+5 −0
Original line number Diff line number Diff line
@@ -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)

 * @aes_gmac: 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)

 */
@@ -4113,6 +4115,9 @@ struct ieee80211_key_seq { 
		struct {

			u8 pn[6];

		} aes_cmac;

		struct {

			u8 pn[6];

		} aes_gmac;

		struct {

			u8 pn[6];

		} gcmp;

net/mac80211/Makefile

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

	aes_gcm.o \

	aes_cmac.o \

	aes_gmac.o \

	cfg.o \

	ethtool.o \

	rx.o \

net/mac80211/aes_gmac.c

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

 * AES-GMAC for IEEE 802.11 BIP-GMAC-128 and BIP-GMAC-256

 * Copyright 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_gmac.h"



#define GMAC_MIC_LEN 16

#define GMAC_NONCE_LEN 12

#define AAD_LEN 20



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

	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;

	u8 zero[GMAC_MIC_LEN], iv[AES_BLOCK_SIZE];



	if (data_len < GMAC_MIC_LEN)

		return -EINVAL;



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



	memset(zero, 0, GMAC_MIC_LEN);

	sg_init_table(sg, 3);

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



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



	crypto_aead_encrypt(aead_req);



	return 0;

}



struct crypto_aead *ieee80211_aes_gmac_key_setup(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)

		return tfm;

	if (!err)

		err = crypto_aead_setauthsize(tfm, GMAC_MIC_LEN);



	crypto_free_aead(tfm);

	return ERR_PTR(err);

}



void ieee80211_aes_gmac_key_free(struct crypto_aead *tfm)

{

	crypto_free_aead(tfm);

}

net/mac80211/aes_gmac.h

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

 * Copyright 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_GMAC_H

#define AES_GMAC_H



#include <linux/crypto.h>



struct crypto_aead *ieee80211_aes_gmac_key_setup(const u8 key[],

						 size_t key_len);

int ieee80211_aes_gmac(struct crypto_aead *tfm, const u8 *aad, u8 *nonce,

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

void ieee80211_aes_gmac_key_free(struct crypto_aead *tfm);



#endif /* AES_GMAC_H */

net/mac80211/cfg.c

+14 −0
Original line number Diff line number Diff line
@@ -165,6 +165,8 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
	case WLAN_CIPHER_SUITE_CCMP_256:

	case WLAN_CIPHER_SUITE_AES_CMAC:

	case WLAN_CIPHER_SUITE_BIP_CMAC_256:

	case WLAN_CIPHER_SUITE_BIP_GMAC_128:

	case WLAN_CIPHER_SUITE_BIP_GMAC_256:

	case WLAN_CIPHER_SUITE_GCMP:

	case WLAN_CIPHER_SUITE_GCMP_256:

		break;
@@ -374,6 +376,18 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev, 
		params.seq = seq;

		params.seq_len = 6;

		break;

	case WLAN_CIPHER_SUITE_BIP_GMAC_128:

	case WLAN_CIPHER_SUITE_BIP_GMAC_256:

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

		seq[0] = pn64;

		seq[1] = pn64 >> 8;

		seq[2] = pn64 >> 16;

		seq[3] = pn64 >> 24;

		seq[4] = pn64 >> 32;

		seq[5] = pn64 >> 40;

		params.seq = seq;

		params.seq_len = 6;

		break;

	case WLAN_CIPHER_SUITE_GCMP:

	case WLAN_CIPHER_SUITE_GCMP_256:

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