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

Commit 3cfcf6ac authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

mac80211: 802.11w - Use BIP (AES-128-CMAC) 



Add mechanism for managing BIP keys (IGTK) and integrate BIP into the
TX/RX paths.

Signed-off-by: default avatarJouni Malinen <j@w1.fi>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 765cb46a

drivers/net/wireless/ath5k/pcu.c

+3 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,9 @@ int ath5k_keycache_type(const struct ieee80211_key_conf *key) 
			return AR5K_KEYTABLE_TYPE_40;

		else if (key->keylen == LEN_WEP104)

			return AR5K_KEYTABLE_TYPE_104;

		return -EINVAL;

	default:

		return -EINVAL;

	}

	return -EINVAL;

}

include/linux/ieee80211.h

+1 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,7 @@ enum ieee80211_back_parties { 
/* reserved: 				0x000FAC03 */

#define WLAN_CIPHER_SUITE_CCMP		0x000FAC04

#define WLAN_CIPHER_SUITE_WEP104	0x000FAC05

#define WLAN_CIPHER_SUITE_AES_CMAC	0x000FAC06



#define WLAN_MAX_KEY_LEN		32

include/linux/nl80211.h

+4 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ 
 *

 * @NL80211_CMD_GET_KEY: Get sequence counter information for a key specified

 *	by %NL80211_ATTR_KEY_IDX and/or %NL80211_ATTR_MAC.

 * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT or

 *	%NL80211_ATTR_KEY_THRESHOLD.

 * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT,

 *	%NL80211_ATTR_KEY_DEFAULT_MGMT, or %NL80211_ATTR_KEY_THRESHOLD.

 * @NL80211_CMD_NEW_KEY: add a key with given %NL80211_ATTR_KEY_DATA,

 *	%NL80211_ATTR_KEY_IDX, %NL80211_ATTR_MAC and %NL80211_ATTR_KEY_CIPHER

 *	attributes.
@@ -346,6 +346,8 @@ enum nl80211_attrs { 
	NL80211_ATTR_WIPHY_FREQ,

	NL80211_ATTR_WIPHY_CHANNEL_TYPE,



	NL80211_ATTR_KEY_DEFAULT_MGMT,



	/* add attributes here, update the policy in nl80211.c */



	__NL80211_ATTR_AFTER_LAST,

include/net/cfg80211.h

+5 −0
Original line number Diff line number Diff line
@@ -473,6 +473,8 @@ struct ieee80211_channel; 
 *

 * @set_default_key: set the default key on an interface

 *

 * @set_default_mgmt_key: set the default management frame key on an interface

 *

 * @add_beacon: Add a beacon with given parameters, @head, @interval

 *	and @dtim_period will be valid, @tail is optional.

 * @set_beacon: Change the beacon parameters for an access point mode
@@ -520,6 +522,9 @@ struct cfg80211_ops { 
	int	(*set_default_key)(struct wiphy *wiphy,

				   struct net_device *netdev,

				   u8 key_index);

	int	(*set_default_mgmt_key)(struct wiphy *wiphy,

					struct net_device *netdev,

					u8 key_index);



	int	(*add_beacon)(struct wiphy *wiphy, struct net_device *dev,

			      struct beacon_parameters *info);

include/net/mac80211.h

+2 −0
Original line number Diff line number Diff line
@@ -651,11 +651,13 @@ struct ieee80211_if_conf { 
 * @ALG_WEP: WEP40 or WEP104

 * @ALG_TKIP: TKIP

 * @ALG_CCMP: CCMP (AES)

 * @ALG_AES_CMAC: AES-128-CMAC

 */

enum ieee80211_key_alg {

	ALG_WEP,

	ALG_TKIP,

	ALG_CCMP,

	ALG_AES_CMAC,

};



/**