From 274d8b776f313700943cd4502c8989149e0930ff Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 1 Sep 2015 17:50:04 +0300 Subject: [PATCH] FILS: Add definitions for new frames and values This adds definitions for various management frame elements and values from P802.11ai/D11.0. Signed-off-by: Jouni Malinen --- src/common/defs.h | 1 + src/common/ieee802_11_defs.h | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/common/defs.h b/src/common/defs.h index 8a62a4c79..4dd5690cb 100644 --- a/src/common/defs.h +++ b/src/common/defs.h @@ -160,6 +160,7 @@ static inline int wpa_key_mgmt_cckm(int akm) #define WPA_AUTH_ALG_LEAP BIT(2) #define WPA_AUTH_ALG_FT BIT(3) #define WPA_AUTH_ALG_SAE BIT(4) +#define WPA_AUTH_ALG_FILS BIT(5) enum wpa_alg { diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h index bd8477287..ca808d796 100644 --- a/src/common/ieee802_11_defs.h +++ b/src/common/ieee802_11_defs.h @@ -81,6 +81,9 @@ #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 @@ -175,6 +178,8 @@ #define WLAN_STATUS_QUERY_RESP_OUTSTANDING 95 #define WLAN_STATUS_DENIED_WITH_SUGGESTED_BAND_AND_CHANNEL 99 #define WLAN_STATUS_ASSOC_DENIED_NO_VHT 104 +#define WLAN_STATUS_FILS_AUTHENTICATION_FAILURE 112 +#define WLAN_STATUS_UNKNOWN_AUTHENTICATION_SERVER 113 /* Reason codes (IEEE 802.11-2007, 7.3.1.7, Table 7-22) */ #define WLAN_REASON_UNSPECIFIED 1 @@ -329,6 +334,7 @@ #define WLAN_ACTION_SELF_PROTECTED 15 #define WLAN_ACTION_WMM 17 /* WMM Specification 1.1 */ #define WLAN_ACTION_FST 18 +#define WLAN_ACTION_FILS 26 #define WLAN_ACTION_VENDOR_SPECIFIC 127 /* Public action codes */ @@ -339,6 +345,7 @@ #define WLAN_PA_GAS_COMEBACK_REQ 12 #define WLAN_PA_GAS_COMEBACK_RESP 13 #define WLAN_TDLS_DISCOVERY_RESPONSE 14 +#define WLAN_PA_FILS_DISCOVERY 34 /* Protected Dual of Public Action frames */ #define WLAN_PROT_DSE_ENABLEMENT 1 @@ -444,6 +451,10 @@ enum anqp_info_id { ANQP_TDLS_CAPABILITY = 270, ANQP_EMERGENCY_NAI = 271, ANQP_NEIGHBOR_REPORT = 272, + ANQP_QUERY_AP_LIST = 273, + ANQP_AP_LIST_RESPONSE = 274, + AMQP_FILS_REALM_INFO = 275, + ANQP_CAG = 276, ANQP_VENUE_URL = 277, ANQP_ADVICE_OF_CHARGE = 278, ANQP_LOCAL_CONTENT = 279, @@ -525,6 +536,8 @@ enum lci_req_subelem { #define FILS_NONCE_LEN 16 #define FILS_SESSION_LEN 8 +#define FILS_CACHE_ID_LEN 2 +#define FILS_MAX_KEY_AUTH_LEN 48 #ifdef _MSC_VER #pragma pack(push, 1)