jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix AKM suite selectors for FILS and Suite B

Browse source 
IEEE 802.11 standard defines the suite selectors in <OUI>:<subtype>
format where OUI uses hexadecimal format and subtype decimal format.
These WLAN_AKM_SUITE_* definitions ended up getting written incorrectly
by interpretting the decimal part as hexadecimal and as such, by having
an incorrect value. However, the older RSN_AUTH_KEY_MGMT_* values were
defined with correct values and those definitions were used in most
locations.

This commit fixes the AKM suite selector values in RADIUS WLAN-AKM-Suite
attribute for FILS and Suite B. In addition, the AKM values used in
nl80211 driver configuration (NL80211_ATTR_AKM_SUITES) are fixed for the
Suite B cases.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2017-01-27 22:55:14 +02:00 committed by Jouni Malinen
parent d7d0f909f1
commit 510fc2dfc9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/ieee802_11_defs.h
View file

@ -1632,12 +1632,12 @@ enum plink_action_field {
#define WLAN_AKM_SUITE_FT_PSK 0x000FAC04 #define WLAN_AKM_SUITE_FT_PSK 0x000FAC04
#define WLAN_AKM_SUITE_8021X_SHA256 0x000FAC05 #define WLAN_AKM_SUITE_8021X_SHA256 0x000FAC05
#define WLAN_AKM_SUITE_PSK_SHA256 0x000FAC06 #define WLAN_AKM_SUITE_PSK_SHA256 0x000FAC06
#define WLAN_AKM_SUITE_8021X_SUITE_B 0x000FAC11 #define WLAN_AKM_SUITE_8021X_SUITE_B 0x000FAC0B
#define WLAN_AKM_SUITE_8021X_SUITE_B_192 0x000FAC12 #define WLAN_AKM_SUITE_8021X_SUITE_B_192 0x000FAC0C
#define WLAN_AKM_SUITE_FILS_SHA256 0x000FAC14 #define WLAN_AKM_SUITE_FILS_SHA256 0x000FAC0E
#define WLAN_AKM_SUITE_FILS_SHA384 0x000FAC15 #define WLAN_AKM_SUITE_FILS_SHA384 0x000FAC0F
#define WLAN_AKM_SUITE_FT_FILS_SHA256 0x000FAC16 #define WLAN_AKM_SUITE_FT_FILS_SHA256 0x000FAC10
#define WLAN_AKM_SUITE_FT_FILS_SHA384 0x000FAC17 #define WLAN_AKM_SUITE_FT_FILS_SHA384 0x000FAC11
#define WLAN_AKM_SUITE_CCKM 0x00409600 #define WLAN_AKM_SUITE_CCKM 0x00409600
#define WLAN_AKM_SUITE_OSEN 0x506f9a01 #define WLAN_AKM_SUITE_OSEN 0x506f9a01