[OpenWrt-Devel] [PATCH] wpa_supplicant: enforce cipher in client mode and cosmetics

[Daniel Golle]

Set both group and pairwise cipher for wpa_supplicant if cipher
is set.
Depends on netifd patch http://patchwork.ozlabs.org/patch/569702/
for cosmetic reasons and changes the use of no longer set
$wpa_pairwise into $wpa_cipher also for AP mode.

Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 package/network/services/hostapd/files/netifd.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index ad96b8b..b7e3721 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -318,7 +318,7 @@ hostapd_set_bss_options() {
 	local auth_algs=$((($auth_mode_shared << 1) | $auth_mode_open))
 	append bss_conf "auth_algs=${auth_algs:-1}" "$N"
 	append bss_conf "wpa=$wpa" "$N"
-	[ -n "$wpa_pairwise" ] && append bss_conf "wpa_pairwise=$wpa_pairwise" "$N"
+	[ -n "$wpa_cipher" ] && append bss_conf "wpa_pairwise=$wpa_cipher" "$N"
 
 	set_default wps_pushbutton 0
 	set_default wps_label 0
@@ -675,6 +675,11 @@ wpa_supplicant_add_network() {
 			;;
 		esac
 
+		if [ -n "$wpa_cipher" ]; then
+			append network_data "pairwise=$wpa_cipher" "$N$T"
+			append network_data "group=$wpa_cipher" "$N$T"
+		fi
+
 		case "$ieee80211w" in
 			[012])
 				[ "$wpa" -ge 2 ] && append network_data "ieee80211w=$ieee80211w" "$N$T"
-- 
2.7.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel