mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-01-12 01:10:15 +02:00
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
This commit is contained in:
parent
ec8e57edd9
commit
8ff68e1f56
25
package/hostapd/patches/750-wps_single_auth_enc_type.patch
Normal file
25
package/hostapd/patches/750-wps_single_auth_enc_type.patch
Normal file
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user