aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/events.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2012-11-24 20:21:29 (GMT)
committerJouni Malinen <j@w1.fi>2012-11-24 20:21:29 (GMT)
commit62d498033109e4fff00f6913bfd83f5d01ad2b14 (patch)
treed61a9cd712a5f2700e2502f369f78c6e48f9f891 /wpa_supplicant/events.c
parent368b1957a61bd0c2932c7532660dff770960047c (diff)
downloadhostap-62d498033109e4fff00f6913bfd83f5d01ad2b14.zip
hostap-62d498033109e4fff00f6913bfd83f5d01ad2b14.tar.gz
hostap-62d498033109e4fff00f6913bfd83f5d01ad2b14.tar.bz2
Allow PMF to be enabled by default
Previously, PMF (protected management frames, IEEE 802.11w) could be enabled only with a per-network parameter (ieee80211w). The new global parameter (pmf) can now be used to change the default behavior to be PMF enabled (pmf=1) or required (pmf=2) for network blocks that do not override this with the ieee80211w parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/events.c')
-rw-r--r--wpa_supplicant/events.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 03c4d2f..13e5ab7 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -426,7 +426,9 @@ static int wpa_supplicant_ssid_bss_match(struct wpa_supplicant *wpa_s,
#ifdef CONFIG_IEEE80211W
if (!(ie.capabilities & WPA_CAPABILITY_MFPC) &&
- ssid->ieee80211w == MGMT_FRAME_PROTECTION_REQUIRED) {
+ (ssid->ieee80211w == MGMT_FRAME_PROTECTION_DEFAULT ?
+ wpa_s->conf->pmf : ssid->ieee80211w) ==
+ MGMT_FRAME_PROTECTION_REQUIRED) {
wpa_dbg(wpa_s, MSG_DEBUG, " skip RSN IE - no mgmt "
"frame protection");
break;