aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-06-30 21:24:30 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-06-30 21:24:30 +0000
commit68d2ffe6c7b0b41f74ea7dbdd8dcc4499db297cf (patch)
tree4f02eb7412fe51b7089b6e248b6f924e935e32b7 /package
parent0574d7e090a871385bc754f8ff07113f15d2159c (diff)
downloadupstream-68d2ffe6c7b0b41f74ea7dbdd8dcc4499db297cf.tar.gz
upstream-68d2ffe6c7b0b41f74ea7dbdd8dcc4499db297cf.tar.bz2
upstream-68d2ffe6c7b0b41f74ea7dbdd8dcc4499db297cf.zip
[package] hostapd: enforce CCMP WPA cipher if hwmode is 11ng or 11na
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22000 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/hostapd/files/hostapd.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 9edb070814..fdb047be6a 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -7,6 +7,9 @@ hostapd_set_bss_options() {
config_get wpa_group_rekey "$vif" wpa_group_rekey
config_get_bool ap_isolate "$vif" isolate 0
+ config_get device "$vif" device
+ config_get hwmode "$device" hwmode
+
if [ "$ap_isolate" -gt 0 ]; then
append "$var" "ap_isolate=$ap_isolate" "$N"
fi
@@ -43,6 +46,11 @@ hostapd_set_bss_options() {
*tkip) crypto="TKIP";;
esac
+ # enforce CCMP for 11ng and 11na
+ case "$hwmode" in
+ *ng|*na) crypto="CCMP";;
+ esac
+
# use crypto/auth settings for building the hostapd config
case "$enc" in
*psk*)