diff mbox

[1/1] STA: Add support for SHA256 AKM suites

Message ID f8173cf27830dbc250bec037562f44e582a90ad3.1400563036.git.jithu@broadcom.com
State Accepted
Headers show

Commit Message

Jithu Jance May 20, 2014, 5:35 a.m. UTC 
Added changes for supporting SHA256 AKM suites. Please
see whether the patch is fine

Signed-off-by: Jithu Jance <jithu@broadcom.com>
---
 src/common/ieee802_11_defs.h |    2 ++
 src/drivers/driver_nl80211.c |   10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

--
1.7.9.5

Comments

Jouni Malinen May 21, 2014, 9:36 p.m. UTC | #1 
On Tue, May 20, 2014 at 11:05:15AM +0530, Jithu Jance wrote:
> Added changes for supporting SHA256 AKM suites. Please
> see whether the patch is fine

Thanks, applied.
diff mbox

Patch

diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index 8fe2e4a..b8e9254 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 2fc32f2..709e13a 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;