summaryrefslogtreecommitdiff
path: root/package/hostapd
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-09 07:19:55 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-09 07:19:55 +0000
commit57d9c06f09fa9021404ee0f07076e30d38a93be0 (patch)
treec114d75eccce70be72caf8bd209a3753b1ec1046 /package/hostapd
parentf3d693c0eeffacf542c1bbaf024e38664dee9ebd (diff)
downloadmtk-20170518-57d9c06f09fa9021404ee0f07076e30d38a93be0.zip
mtk-20170518-57d9c06f09fa9021404ee0f07076e30d38a93be0.tar.gz
mtk-20170518-57d9c06f09fa9021404ee0f07076e30d38a93be0.tar.bz2
hostapd: only advertise a single encryption type via WPS if multiple are supported - fixes windows 7 interop issues
SVN-Revision: 27569
Diffstat (limited to 'package/hostapd')
-rw-r--r--package/hostapd/patches/750-wps_single_auth_enc_type.patch25
1 files changed, 25 insertions, 0 deletions
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 0000000..4925e9c
--- /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;
+ }
+