From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 30 Jun 2010 21:03:56 +0000 (+0000)
Subject: hostapd: allow *ccmp+tkip and *aes+tkip as well for cipher override
X-Git-Tag: reboot~19508
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=f391ff4ec807918aa09595a14f0f06c81faa9531

hostapd: allow *ccmp+tkip and *aes+tkip as well for cipher override

SVN-Revision: 21998
---

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index a41c7678a7..9edb070814 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -38,7 +38,7 @@ hostapd_set_bss_options() {
 
 	# explicit override for crypto setting
 	case "$enc" in
-		*tkip+aes|*tkip+ccmp) crypto="CCMP TKIP";;
+		*tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) crypto="CCMP TKIP";;
 		*aes|*ccmp) crypto="CCMP";;
 		*tkip) crypto="TKIP";;
 	esac