aboutsummaryrefslogtreecommitdiffstats
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
commite183a088f6d68dfa4be51c6dd740408dc67f6725 (patch)
treea3a1a05f72d0a4ac4fed38148bbe3ccf5ed39c04 /package/hostapd
parentcc059267c784d0e1f3405f8795fb6324e543db9b (diff)
downloadupstream-e183a088f6d68dfa4be51c6dd740408dc67f6725.tar.gz
upstream-e183a088f6d68dfa4be51c6dd740408dc67f6725.tar.bz2
upstream-e183a088f6d68dfa4be51c6dd740408dc67f6725.zip
hostapd: only advertise a single encryption type via WPS if multiple are supported - fixes windows 7 interop issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27569 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 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;
+ }
+