From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 9 Jul 2011 07:19:55 +0000 (+0000)
Subject: hostapd: only advertise a single encryption type via WPS if multiple are supported... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=57d9c06f09fa9021404ee0f07076e30d38a93be0;p=openwrt%2Fstaging%2Frobimarko.git

hostapd: only advertise a single encryption type via WPS if multiple are supported - fixes windows 7 interop issues

SVN-Revision: 27569
---

diff --git a/package/hostapd/patches/750-wps_single_auth_enc_type.patch b/package/hostapd/patches/750-wps_single_auth_enc_type.patch
new file mode 100644
index 0000000000..4925e9c7fb
--- /dev/null
+++ b/package/hostapd/patches/750-wps_single_auth_enc_type.patch
@@ -0,0 +1,25 @@
+--- a/src/ap/wps_hostapd.c
++++ b/src/ap/wps_hostapd.c
+@@ -773,11 +773,9 @@ int hostapd_init_wps(struct hostapd_data
+ 
+ 		if (conf->rsn_pairwise & WPA_CIPHER_CCMP)
+ 			wps->encr_types |= WPS_ENCR_AES;
+-		if (conf->rsn_pairwise & WPA_CIPHER_TKIP)
++		else if (conf->rsn_pairwise & WPA_CIPHER_TKIP)
+ 			wps->encr_types |= WPS_ENCR_TKIP;
+-	}
+-
+-	if (conf->wpa & WPA_PROTO_WPA) {
++	} else if (conf->wpa & WPA_PROTO_WPA) {
+ 		if (conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK)
+ 			wps->auth_types |= WPS_AUTH_WPAPSK;
+ 		if (conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X)
+@@ -785,7 +783,7 @@ int hostapd_init_wps(struct hostapd_data
+ 
+ 		if (conf->wpa_pairwise & WPA_CIPHER_CCMP)
+ 			wps->encr_types |= WPS_ENCR_AES;
+-		if (conf->wpa_pairwise & WPA_CIPHER_TKIP)
++		else if (conf->wpa_pairwise & WPA_CIPHER_TKIP)
+ 			wps->encr_types |= WPS_ENCR_TKIP;
+ 	}
+