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

Added temporary #ifdef WEXT_MFP_PENDING around the MFP changes

Browse source 
Just in case, do not use the not-yet-approved WEXT changes even if someone
where to build wpa_supplicant with IEEE 802.11w support unless this new
macro has been defined explicitly.
This commit is contained in:
Jouni Malinen 2008-06-18 11:18:26 +03:00
parent f0732adfe0
commit 089165e6a4
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/drivers/driver_wext.c
View file

@ -1800,11 +1800,13 @@ static int wpa_driver_wext_set_key_ext(void *priv, wpa_alg alg,
case WPA_ALG_PMK: case WPA_ALG_PMK:
ext->alg = IW_ENCODE_ALG_PMK; ext->alg = IW_ENCODE_ALG_PMK;
break; break;
#ifdef WEXT_MFP_PENDING
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
case WPA_ALG_IGTK: case WPA_ALG_IGTK:
ext->alg = IW_ENCODE_ALG_AES_CMAC; ext->alg = IW_ENCODE_ALG_AES_CMAC;
break; break;
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
#endif /* WEXT_MFP_PENDING */
default: default:
wpa_printf(MSG_DEBUG, "%s: Unknown algorithm %d", wpa_printf(MSG_DEBUG, "%s: Unknown algorithm %d",
__FUNCTION__, alg); __FUNCTION__, alg);
@ -2158,6 +2160,7 @@ int wpa_driver_wext_associate(void *priv,
IW_AUTH_RX_UNENCRYPTED_EAPOL, IW_AUTH_RX_UNENCRYPTED_EAPOL,
allow_unencrypted_eapol) < 0) allow_unencrypted_eapol) < 0)
ret = -1; ret = -1;
#ifdef WEXT_MFP_PENDING
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
switch (params->mgmt_frame_protection) { switch (params->mgmt_frame_protection) {
case NO_MGMT_FRAME_PROTECTION: case NO_MGMT_FRAME_PROTECTION:
@ -2173,6 +2176,7 @@ int wpa_driver_wext_associate(void *priv,
if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_MFP, value) < 0) if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_MFP, value) < 0)
ret = -1; ret = -1;
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
#endif /* WEXT_MFP_PENDING */
if (params->freq && wpa_driver_wext_set_freq(drv, params->freq) < 0) if (params->freq && wpa_driver_wext_set_freq(drv, params->freq) < 0)
ret = -1; ret = -1;
if (wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0) if (wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0)