DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

nl80211: Indicate SHA256-based AKM suites in CONNECT/ASSOCIATE

Browse source 
Previously, the NL80211_ATTR_AKM_SUITES was skipped if either of these
SHA256-based AKMs was negotiated.

Signed-off-by: Jithu Jance <jithu@broadcom.com>
This commit is contained in:
Jithu Jance 2014-05-20 11:05:15 +05:30 committed by Jouni Malinen
parent e044016422
commit 8802326ff9
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/ieee802_11_defs.h
View file

@ -1119,6 +1119,8 @@ enum wifi_display_subelem {
#define WLAN_AKM_SUITE_PSK 0x000FAC02 #define WLAN_AKM_SUITE_PSK 0x000FAC02
#define WLAN_AKM_SUITE_FT_8021X 0x000FAC03 #define WLAN_AKM_SUITE_FT_8021X 0x000FAC03
#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_PSK_SHA256 0x000FAC06
#define WLAN_AKM_SUITE_CCKM 0x00409600 #define WLAN_AKM_SUITE_CCKM 0x00409600
#define WLAN_AKM_SUITE_OSEN 0x506f9a01 #define WLAN_AKM_SUITE_OSEN 0x506f9a01

10
src/drivers/driver_nl80211.c
View file

@ -8739,7 +8739,9 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
params->key_mgmt_suite == WPA_KEY_MGMT_FT_IEEE8021X || params->key_mgmt_suite == WPA_KEY_MGMT_FT_IEEE8021X ||
params->key_mgmt_suite == WPA_KEY_MGMT_FT_PSK || params->key_mgmt_suite == WPA_KEY_MGMT_FT_PSK ||
params->key_mgmt_suite == WPA_KEY_MGMT_CCKM || params->key_mgmt_suite == WPA_KEY_MGMT_CCKM ||
params->key_mgmt_suite == WPA_KEY_MGMT_OSEN) { params->key_mgmt_suite == WPA_KEY_MGMT_OSEN ||
params->key_mgmt_suite == WPA_KEY_MGMT_IEEE8021X_SHA256 ||
params->key_mgmt_suite == WPA_KEY_MGMT_PSK_SHA256) {
int mgmt = WLAN_AKM_SUITE_PSK; int mgmt = WLAN_AKM_SUITE_PSK;
switch (params->key_mgmt_suite) { switch (params->key_mgmt_suite) {
@ -8755,6 +8757,12 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
case WPA_KEY_MGMT_FT_PSK: case WPA_KEY_MGMT_FT_PSK:
mgmt = WLAN_AKM_SUITE_FT_PSK; mgmt = WLAN_AKM_SUITE_FT_PSK;
break; break;
case WPA_KEY_MGMT_IEEE8021X_SHA256:
mgmt = WLAN_AKM_SUITE_8021X_SHA256;
break;
case WPA_KEY_MGMT_PSK_SHA256:
mgmt = WLAN_AKM_SUITE_PSK_SHA256;
break;
case WPA_KEY_MGMT_OSEN: case WPA_KEY_MGMT_OSEN:
mgmt = WLAN_AKM_SUITE_OSEN; mgmt = WLAN_AKM_SUITE_OSEN;
break; break;