mirror of https://github.com/hak5/openwrt-owl.git
hostapd: only advertise a single encryption type via WPS if multiple are supported - fixes windows 7 interop issues
SVN-Revision: 27569owl
parent
f3d693c0ee
commit
57d9c06f09
|
@ -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