diff options
| author | Travis Kemen <thepeople@openwrt.org> | 2010-03-24 00:21:28 +0000 |
|---|---|---|
| committer | Travis Kemen <thepeople@openwrt.org> | 2010-03-24 00:21:28 +0000 |
| commit | 650507a240180b78b95e55110c63dca74b2af0b0 (patch) | |
| tree | 9c233a97be6de1c0dd53e0e78be215b9cb8314bb /package | |
| parent | fd9e31f189e5806a6ebe31382d349d71308fb224 (diff) | |
| download | upstream-650507a240180b78b95e55110c63dca74b2af0b0.tar.gz upstream-650507a240180b78b95e55110c63dca74b2af0b0.tar.bz2 upstream-650507a240180b78b95e55110c63dca74b2af0b0.zip | |
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')
| -rw-r--r-- | package/hostapd/files/wpa_supplicant-full.config | 2 | ||||
| -rw-r--r-- | package/hostapd/files/wpa_supplicant.sh | 10 |
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 5e7fd27d1b..8d6813a56b 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 b6499e6c68..74d20c6662 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 |