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

Commit 054789c4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cfg80211: Add Fast Initial Link Setup (FILS) auth algs"

parents 51977976 16793068

include/linux/ieee80211.h

+3 −0
Original line number Diff line number Diff line
@@ -1535,6 +1535,9 @@ struct ieee80211_vht_operation { 
#define WLAN_AUTH_SHARED_KEY 1

#define WLAN_AUTH_FT 2

#define WLAN_AUTH_SAE 3

#define WLAN_AUTH_FILS_SK 4

#define WLAN_AUTH_FILS_SK_PFS 5

#define WLAN_AUTH_FILS_PK 6

#define WLAN_AUTH_LEAP 128



#define WLAN_AUTH_CHALLENGE_LEN 128

include/net/cfg80211.h

+7 −5
Original line number Diff line number Diff line
@@ -1783,9 +1783,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;
@@ -1794,8 +1796,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

+18 −3
Original line number Diff line number Diff line
@@ -1637,8 +1637,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)
@@ -2215,7 +2223,7 @@ enum nl80211_attrs { 


	NL80211_ATTR_CONN_FAILED_REASON,



	NL80211_ATTR_SAE_DATA,

	NL80211_ATTR_AUTH_DATA,



	NL80211_ATTR_VHT_CAPABILITY,
@@ -2379,6 +2387,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
@@ -3666,6 +3675,9 @@ enum nl80211_bss_status { 
 * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)

 * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)

 * @NL80211_AUTHTYPE_SAE: Simultaneous authentication of equals

 * @NL80211_AUTHTYPE_FILS_SK: Fast Initial Link Setup shared key

 * @NL80211_AUTHTYPE_FILS_SK_PFS: Fast Initial Link Setup shared key with PFS

 * @NL80211_AUTHTYPE_FILS_PK: Fast Initial Link Setup public key

 * @__NL80211_AUTHTYPE_NUM: internal

 * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm

 * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by
@@ -3678,6 +3690,9 @@ enum nl80211_auth_type { 
	NL80211_AUTHTYPE_FT,

	NL80211_AUTHTYPE_NETWORK_EAP,

	NL80211_AUTHTYPE_SAE,

	NL80211_AUTHTYPE_FILS_SK,

	NL80211_AUTHTYPE_FILS_SK_PFS,

	NL80211_AUTHTYPE_FILS_PK,



	/* keep last */

	__NL80211_AUTHTYPE_NUM,

net/mac80211/mlme.c

+6 −6
Original line number Diff line number Diff line
@@ -4490,20 +4490,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
@@ -335,7 +335,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,