From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 30 Jun 2010 21:24:30 +0000 (+0000)
Subject: hostapd: enforce CCMP WPA cipher if hwmode is 11ng or 11na
X-Git-Tag: reboot~19506
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=5f895af9fb2a65c6e51ac0e6e6085cf95ae9d1b9

hostapd: enforce CCMP WPA cipher if hwmode is 11ng or 11na

SVN-Revision: 22000
---

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