From 8802326ff95fc6b31d666f904bbb2e9253afb5cf Mon Sep 17 00:00:00 2001 From: Jithu Jance Date: Tue, 20 May 2014 11:05:15 +0530 Subject: [PATCH] nl80211: Indicate SHA256-based AKM suites in CONNECT/ASSOCIATE Previously, the NL80211_ATTR_AKM_SUITES was skipped if either of these SHA256-based AKMs was negotiated. Signed-off-by: Jithu Jance --- src/common/ieee802_11_defs.h | 2 ++ src/drivers/driver_nl80211.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h index 8fe2e4a67..b8e9254f6 100644 --- a/src/common/ieee802_11_defs.h +++ b/src/common/ieee802_11_defs.h @@ -1119,6 +1119,8 @@ enum wifi_display_subelem { #define WLAN_AKM_SUITE_PSK 0x000FAC02 #define WLAN_AKM_SUITE_FT_8021X 0x000FAC03 #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_OSEN 0x506f9a01 diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 2fc32f231..709e13ab1 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -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_PSK || 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; 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: mgmt = WLAN_AKM_SUITE_FT_PSK; 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: mgmt = WLAN_AKM_SUITE_OSEN; break;