summaryrefslogtreecommitdiffstats
path: root/package/hostapd/files
diff options
context:
space:
mode:
authorthepeople <thepeople@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-24 00:21:28 +0000
committerthepeople <thepeople@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-24 00:21:28 +0000
commit1e54b33b0127519366f04f658a1a1ee7afe335f8 (patch)
tree9c233a97be6de1c0dd53e0e78be215b9cb8314bb /package/hostapd/files
parentbc38a415b6a44559b809b10348a8ac4f9fa434d1 (diff)
Enable management frame protection in wpa_supplicant, and make it
configurable in /etc/config/wireless. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20395 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hostapd/files')
-rw-r--r--package/hostapd/files/wpa_supplicant-full.config2
-rw-r--r--package/hostapd/files/wpa_supplicant.sh10
2 files changed, 11 insertions, 1 deletions
diff --git a/package/hostapd/files/wpa_supplicant-full.config b/package/hostapd/files/wpa_supplicant-full.config
index 5e7fd27d1..8d6813a56 100644
--- a/package/hostapd/files/wpa_supplicant-full.config
+++ b/package/hostapd/files/wpa_supplicant-full.config
@@ -301,7 +301,7 @@ CONFIG_PEERKEY=y
# This version is an experimental implementation based on IEEE 802.11w/D1.0
# draft and is subject to change since the standard has not yet been finalized.
# Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
+CONFIG_IEEE80211W=y
# Select TLS implementation
# openssl = OpenSSL (default)
diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index b6499e6c6..74d20c666 100644
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -58,6 +58,7 @@ wpa_supplicant_setup_vif() {
case "$enc" in
*psk2*)
proto='proto=RSN'
+ config_get ieee80211w "$vif" ieee80211w
;;
*psk*)
proto='proto=WPA'
@@ -67,6 +68,7 @@ wpa_supplicant_setup_vif() {
*wpa*|*8021x*)
proto='proto=WPA2'
key_mgmt='WPA-EAP'
+ config_get ieee80211w "$vif" ieee80211w
config_get ca_cert "$vif" ca_cert
ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""}
case "$eap_type" in
@@ -90,6 +92,13 @@ wpa_supplicant_setup_vif() {
eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')"
;;
esac
+
+ case "$ieee80211w" in
+ [012])
+ ieee80211w="ieee80211w=$ieee80211w"
+ ;;
+ esac
+
config_get ifname "$vif" ifname
config_get bridge "$vif" bridge
config_get ssid "$vif" ssid
@@ -104,6 +113,7 @@ network={
$bssid
key_mgmt=$key_mgmt
$proto
+ $ieee80211w
$passphrase
$pairwise
$group