History

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.

Jouni Malinen committed 10 years ago

Commit 11b6b5a1 parent bfe2c7b6 files · +38 −27Browse files

Showing the changes to include/uapi/linux (1 of 6 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+12−3
@@ -1638,8 +1638,16 @@ enum nl80211_commands { · 1637 unmodified lines
16381638 * the connection request from a station. nl80211_connect_failed_reason
16391639 * enum has different reasons of connection failure.
16401640 *
1641− * @NL80211_ATTR_SAE_DATA: SAE elements in Authentication frames. This starts
1642− * with the Authentication transaction sequence number field.
1641+ * @NL80211_ATTR_AUTH_DATA: Fields and elements in Authentication frames.
1642+ * This contains the authentication frame body (non-IE and IE data),
1643+ * excluding the Authentication algorithm number, i.e., starting at the
1644+ * Authentication transaction sequence number field. It is used with
1645+ * authentication algorithms that need special fields to be added into
1646+ * the frames (SAE and FILS). Currently, only the SAE cases use the
1647+ * initial two fields (Authentication transaction sequence number and
1648+ * Status code). However, those fields are included in the attribute data
1649+ * for all authentication algorithms to keep the attribute definition
1650+ * consistent.
16431651 *
16441652 * @NL80211_ATTR_VHT_CAPABILITY: VHT Capability information element (from
16451653 * association request when used with NL80211_CMD_NEW_STATION)
@@ -2195,7 +2203,7 @@ enum nl80211_attrs { · 549 unmodified lines
21952203
21962204 NL80211_ATTR_CONN_FAILED_REASON,
21972205
2198− NL80211_ATTR_SAE_DATA,
2206+ NL80211_ATTR_AUTH_DATA,
21992207
22002208 NL80211_ATTR_VHT_CAPABILITY,
22012209
@@ -2347,6 +2355,7 @@ enum nl80211_attrs { · 145 unmodified lines
23472355 #define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION
23482356 #define NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG
23492357 #define NL80211_ATTR_IFACE_SOCKET_OWNER NL80211_ATTR_SOCKET_OWNER
2358+#define NL80211_ATTR_SAE_DATA NL80211_ATTR_AUTH_DATA
23502359
23512360 /*
23522361 * Allow user space programs to use #ifdef on new attributes by defining them

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t