aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/wpa_supplicant.conf
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/wpa_supplicant.conf
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/wpa_supplicant.conf')
-rw-r--r--wpa_supplicant/wpa_supplicant.conf10
1 files changed, 9 insertions, 1 deletions
diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf
index e1000fe..5f0dec6 100644
--- a/wpa_supplicant/wpa_supplicant.conf
+++ b/wpa_supplicant/wpa_supplicant.conf
@@ -273,6 +273,14 @@ fast_reauth=1
# can be disabled with per-network proactive_key_caching=0 parameter.
#okc=0
+# Protected Management Frames default
+# This parameter can be used to set the default behavior for the ieee80211w
+# parameter. By default, PMF is disabled unless enabled with the global pmf=1/2
+# parameter or with the per-network ieee80211w=1/2 parameter. With pmf=1/2, PMF
+# is enabled/required by default, but can be disabled with the per-network
+# ieee80211w parameter.
+#pmf=0
+
# Interworking (IEEE 802.11u)
# Enable Interworking
@@ -497,7 +505,7 @@ fast_reauth=1
# If not set, this defaults to: WPA-PSK WPA-EAP
#
# ieee80211w: whether management frame protection is enabled
-# 0 = disabled (default)
+# 0 = disabled (default unless changed with the global pmf parameter)
# 1 = optional
# 2 = required
# The most common configuration options for this based on the PMF (protected