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

Use RSN_AUTH_KEY_MGMT_* instead of WLAN_AKM_SUITE_* for wpa_akm_to_suite()

Browse source 
This is a step towards getting rid of the unnecessary duplication of
definitions.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2017-01-28 12:34:49 +02:00
parent 3aa24db953
commit bf9f8a0525
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/common/wpa_common.c
View file

@ -1484,35 +1484,33 @@ const char * wpa_key_mgmt_txt(int key_mgmt, int proto)
u32 wpa_akm_to_suite(int akm) u32 wpa_akm_to_suite(int akm)
{ {
if (akm & WPA_KEY_MGMT_FT_IEEE8021X) 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) if (akm & WPA_KEY_MGMT_FT_PSK)
return WLAN_AKM_SUITE_FT_PSK; return RSN_AUTH_KEY_MGMT_FT_PSK;
if (akm & WPA_KEY_MGMT_IEEE8021X)
return WLAN_AKM_SUITE_8021X;
if (akm & WPA_KEY_MGMT_IEEE8021X_SHA256) 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) 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) 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) 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) if (akm & WPA_KEY_MGMT_CCKM)
return WLAN_AKM_SUITE_CCKM; return RSN_AUTH_KEY_MGMT_CCKM;
if (akm & WPA_KEY_MGMT_OSEN) 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) 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) 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) 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) 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) 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) 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; return 0;
} }