From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 30 Jun 2010 21:24:30 +0000 (+0000)
Subject: [package] hostapd: enforce CCMP WPA cipher if hwmode is 11ng or 11na
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=60a32ced826dfc7b344a24c050f8538cf8f7a63d;p=openwrt.git

[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
---

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*)