diff options
| author | Jouni Malinen <j@w1.fi> | 2008-08-30 14:59:39 +0300 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2008-08-30 14:59:39 +0300 |
| commit | 0b60b0aaadaeec905d8e07a56b88cdfa83cad300 (patch) | |
| tree | 142434f6e58e51ecbf176d941e0cc959d4a6a37e /hostapd/wpa_auth_ie.c | |
| parent | b3f240bc0e3fbab466cd819f024451189af4fe9c (diff) | |
| download | external_wpa_supplicant_8_ti-0b60b0aaadaeec905d8e07a56b88cdfa83cad300.zip external_wpa_supplicant_8_ti-0b60b0aaadaeec905d8e07a56b88cdfa83cad300.tar.gz external_wpa_supplicant_8_ti-0b60b0aaadaeec905d8e07a56b88cdfa83cad300.tar.bz2 | |
Updated MFP defines based on IEEE 802.11w/D6.0 and use new MFPC/MFPR
This adds most of the new frame format and identifier definitions from IEEE
802.11w/D6.0. In addition, the RSN IE capability field values for MFP is
replaced with the new two-bit version with MFPC (capable) and MFPR
(required) processing.
Diffstat (limited to 'hostapd/wpa_auth_ie.c')
| -rw-r--r-- | hostapd/wpa_auth_ie.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/hostapd/wpa_auth_ie.c b/hostapd/wpa_auth_ie.c index 7af7531..78b0693 100644 --- a/hostapd/wpa_auth_ie.c +++ b/hostapd/wpa_auth_ie.c @@ -208,8 +208,11 @@ int wpa_write_rsn_ie(struct wpa_auth_config *conf, u8 *buf, size_t len, capab |= (RSN_NUM_REPLAY_COUNTERS_16 << 2); } #ifdef CONFIG_IEEE80211W - if (conf->ieee80211w != WPA_NO_IEEE80211W) - capab |= WPA_CAPABILITY_MGMT_FRAME_PROTECTION; + if (conf->ieee80211w != WPA_NO_IEEE80211W) { + capab |= WPA_CAPABILITY_MFPC; + if (conf->ieee80211w == IEEE80211W_REQUIRED) + capab |= WPA_CAPABILITY_MFPR; + } #endif /* CONFIG_IEEE80211W */ WPA_PUT_LE16(pos, capab); pos += 2; @@ -580,8 +583,7 @@ int wpa_validate_wpa_ie(struct wpa_authenticator *wpa_auth, #ifdef CONFIG_IEEE80211W if (wpa_auth->conf.ieee80211w == WPA_IEEE80211W_REQUIRED) { - if (!(data.capabilities & - WPA_CAPABILITY_MGMT_FRAME_PROTECTION)) { + if (!(data.capabilities & WPA_CAPABILITY_MFPC)) { wpa_printf(MSG_DEBUG, "Management frame protection " "required, but client did not enable it"); return WPA_MGMT_FRAME_PROTECTION_VIOLATION; @@ -601,7 +603,7 @@ int wpa_validate_wpa_ie(struct wpa_authenticator *wpa_auth, } if (wpa_auth->conf.ieee80211w == WPA_NO_IEEE80211W || - !(data.capabilities & WPA_CAPABILITY_MGMT_FRAME_PROTECTION)) + !(data.capabilities & WPA_CAPABILITY_MFPC)) sm->mgmt_frame_prot = 0; else sm->mgmt_frame_prot = 1; |