Commit 11b6b5a4 authored by Jouni Malinen's avatar Jouni Malinen Committed by Johannes Berg
Browse files

cfg80211: Rename SAE_DATA to more generic AUTH_DATA 



This adds defines and nl80211 extensions to allow FILS Authentication to
be implemented similarly to SAE. FILS does not need the special rules
for the Authentication transaction number and Status code fields, but it
does need to add non-IE fields. The previously used
NL80211_ATTR_SAE_DATA can be reused for this to avoid having to
duplicate that implementation. Rename that attribute to more generic
NL80211_ATTR_AUTH_DATA (with backwards compatibility define for
NL80211_SAE_DATA).

Also document the special rules related to the Authentication
transaction number and Status code fiels.

Signed-off-by: default avatarJouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent bfe2c7b1

include/net/cfg80211.h

+7 −5
Original line number Diff line number Diff line
@@ -1785,9 +1785,11 @@ const u8 *ieee80211_bss_get_ie(struct cfg80211_bss *bss, u8 ie); 
 * @key_len: length of WEP key for shared key authentication

 * @key_idx: index of WEP key for shared key authentication

 * @key: WEP key for shared key authentication

 * @sae_data: Non-IE data to use with SAE or %NULL. This starts with

 *	Authentication transaction sequence number field.

 * @sae_data_len: Length of sae_data buffer in octets

 * @auth_data: Fields and elements in Authentication frames. This contains

 *	the authentication frame body (non-IE and IE data), excluding the

 *	Authentication algorithm number, i.e., starting at the Authentication

 *	transaction sequence number field.

 * @auth_data_len: Length of auth_data buffer in octets

 */

struct cfg80211_auth_request {

	struct cfg80211_bss *bss;
@@ -1796,8 +1798,8 @@ struct cfg80211_auth_request { 
	enum nl80211_auth_type auth_type;

	const u8 *key;

	u8 key_len, key_idx;

	const u8 *sae_data;

	size_t sae_data_len;

	const u8 *auth_data;

	size_t auth_data_len;

};



/**

include/uapi/linux/nl80211.h

+12 −3
Original line number Diff line number Diff line
@@ -1638,8 +1638,16 @@ enum nl80211_commands { 
 *	the connection request from a station. nl80211_connect_failed_reason

 *	enum has different reasons of connection failure.

 *

 * @NL80211_ATTR_SAE_DATA: SAE elements in Authentication frames. This starts

 *	with the Authentication transaction sequence number field.

 * @NL80211_ATTR_AUTH_DATA: Fields and elements in Authentication frames.

 *	This contains the authentication frame body (non-IE and IE data),

 *	excluding the Authentication algorithm number, i.e., starting at the

 *	Authentication transaction sequence number field. It is used with

 *	authentication algorithms that need special fields to be added into

 *	the frames (SAE and FILS). Currently, only the SAE cases use the

 *	initial two fields (Authentication transaction sequence number and

 *	Status code). However, those fields are included in the attribute data

 *	for all authentication algorithms to keep the attribute definition

 *	consistent.

 *

 * @NL80211_ATTR_VHT_CAPABILITY: VHT Capability information element (from

 *	association request when used with NL80211_CMD_NEW_STATION)
@@ -2195,7 +2203,7 @@ enum nl80211_attrs { 


	NL80211_ATTR_CONN_FAILED_REASON,



	NL80211_ATTR_SAE_DATA,

	NL80211_ATTR_AUTH_DATA,



	NL80211_ATTR_VHT_CAPABILITY,
@@ -2347,6 +2355,7 @@ enum nl80211_attrs { 
#define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION

#define	NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG

#define NL80211_ATTR_IFACE_SOCKET_OWNER NL80211_ATTR_SOCKET_OWNER

#define NL80211_ATTR_SAE_DATA NL80211_ATTR_AUTH_DATA



/*

 * Allow user space programs to use #ifdef on new attributes by defining them

net/mac80211/mlme.c

+6 −6
Original line number Diff line number Diff line
@@ -4483,20 +4483,20 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, 
		return -EOPNOTSUPP;

	}



	auth_data = kzalloc(sizeof(*auth_data) + req->sae_data_len +

	auth_data = kzalloc(sizeof(*auth_data) + req->auth_data_len +

			    req->ie_len, GFP_KERNEL);

	if (!auth_data)

		return -ENOMEM;



	auth_data->bss = req->bss;



	if (req->sae_data_len >= 4) {

		__le16 *pos = (__le16 *) req->sae_data;

	if (req->auth_data_len >= 4) {

		__le16 *pos = (__le16 *) req->auth_data;

		auth_data->sae_trans = le16_to_cpu(pos[0]);

		auth_data->sae_status = le16_to_cpu(pos[1]);

		memcpy(auth_data->data, req->sae_data + 4,

		       req->sae_data_len - 4);

		auth_data->data_len += req->sae_data_len - 4;

		memcpy(auth_data->data, req->auth_data + 4,

		       req->auth_data_len - 4);

		auth_data->data_len += req->auth_data_len - 4;

	}



	if (req->ie && req->ie_len) {

net/wireless/core.h

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ int cfg80211_mlme_auth(struct cfg80211_registered_device *rdev, 
		       const u8 *ssid, int ssid_len,

		       const u8 *ie, int ie_len,

		       const u8 *key, int key_len, int key_idx,

		       const u8 *sae_data, int sae_data_len);

		       const u8 *auth_data, int auth_data_len);

int cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,

			struct net_device *dev,

			struct ieee80211_channel *chan,

net/wireless/mlme.c

+3 −3
Original line number Diff line number Diff line
@@ -204,14 +204,14 @@ int cfg80211_mlme_auth(struct cfg80211_registered_device *rdev, 
		       const u8 *ssid, int ssid_len,

		       const u8 *ie, int ie_len,

		       const u8 *key, int key_len, int key_idx,

		       const u8 *sae_data, int sae_data_len)

		       const u8 *auth_data, int auth_data_len)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

	struct cfg80211_auth_request req = {

		.ie = ie,

		.ie_len = ie_len,

		.sae_data = sae_data,

		.sae_data_len = sae_data_len,

		.auth_data = auth_data,

		.auth_data_len = auth_data_len,

		.auth_type = auth_type,

		.key = key,

		.key_len = key_len,

CRA Git | Maintained and supported by SUSTech CRA and CCSE