From bf9f8a0525aaf247ee89a880cf877d7f8432b20a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 28 Jan 2017 12:34:49 +0200 Subject: [PATCH] Use RSN_AUTH_KEY_MGMT_* instead of WLAN_AKM_SUITE_* for wpa_akm_to_suite() This is a step towards getting rid of the unnecessary duplication of definitions. Signed-off-by: Jouni Malinen --- src/common/wpa_common.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/common/wpa_common.c b/src/common/wpa_common.c index c9cdc6984..79f001bd1 100644 --- a/src/common/wpa_common.c +++ b/src/common/wpa_common.c @@ -1484,35 +1484,33 @@ const char * wpa_key_mgmt_txt(int key_mgmt, int proto) u32 wpa_akm_to_suite(int akm) { if (akm & WPA_KEY_MGMT_FT_IEEE8021X) - return WLAN_AKM_SUITE_FT_8021X; + return RSN_AUTH_KEY_MGMT_FT_802_1X; if (akm & WPA_KEY_MGMT_FT_PSK) - return WLAN_AKM_SUITE_FT_PSK; - if (akm & WPA_KEY_MGMT_IEEE8021X) - return WLAN_AKM_SUITE_8021X; + return RSN_AUTH_KEY_MGMT_FT_PSK; if (akm & WPA_KEY_MGMT_IEEE8021X_SHA256) - return WLAN_AKM_SUITE_8021X_SHA256; + return RSN_AUTH_KEY_MGMT_802_1X_SHA256; if (akm & WPA_KEY_MGMT_IEEE8021X) - return WLAN_AKM_SUITE_8021X; + return RSN_AUTH_KEY_MGMT_UNSPEC_802_1X; if (akm & WPA_KEY_MGMT_PSK_SHA256) - return WLAN_AKM_SUITE_PSK_SHA256; + return RSN_AUTH_KEY_MGMT_PSK_SHA256; if (akm & WPA_KEY_MGMT_PSK) - return WLAN_AKM_SUITE_PSK; + return RSN_AUTH_KEY_MGMT_PSK_OVER_802_1X; if (akm & WPA_KEY_MGMT_CCKM) - return WLAN_AKM_SUITE_CCKM; + return RSN_AUTH_KEY_MGMT_CCKM; if (akm & WPA_KEY_MGMT_OSEN) - return WLAN_AKM_SUITE_OSEN; + return RSN_AUTH_KEY_MGMT_OSEN; if (akm & WPA_KEY_MGMT_IEEE8021X_SUITE_B) - return WLAN_AKM_SUITE_8021X_SUITE_B; + return RSN_AUTH_KEY_MGMT_802_1X_SUITE_B; if (akm & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192) - return WLAN_AKM_SUITE_8021X_SUITE_B_192; + return RSN_AUTH_KEY_MGMT_802_1X_SUITE_B_192; if (akm & WPA_KEY_MGMT_FILS_SHA256) - return WLAN_AKM_SUITE_FILS_SHA256; + return RSN_AUTH_KEY_MGMT_FILS_SHA256; if (akm & WPA_KEY_MGMT_FILS_SHA384) - return WLAN_AKM_SUITE_FILS_SHA384; + return RSN_AUTH_KEY_MGMT_FILS_SHA384; if (akm & WPA_KEY_MGMT_FT_FILS_SHA256) - return WLAN_AKM_SUITE_FT_FILS_SHA256; + return RSN_AUTH_KEY_MGMT_FT_FILS_SHA256; if (akm & WPA_KEY_MGMT_FT_FILS_SHA384) - return WLAN_AKM_SUITE_FT_FILS_SHA384; + return RSN_AUTH_KEY_MGMT_FT_FILS_SHA384; return 0; }