hostapd: only advertise a single encryption type via WPS if multiple are supported
Fixes windows 7 interop issues
This commit is contained in:
parent
10bbad15ac
commit
710e402cd3
1 changed files with 2 additions and 4 deletions
|
@ -394,9 +394,8 @@ static int hapd_wps_reconfig_in_memory(struct hostapd_data *hapd,
|
|||
bss->wpa_pairwise |= WPA_CIPHER_GCMP;
|
||||
else
|
||||
bss->wpa_pairwise |= WPA_CIPHER_CCMP;
|
||||
}
|
||||
#ifndef CONFIG_NO_TKIP
|
||||
if (cred->encr_type & WPS_ENCR_TKIP)
|
||||
} else if (cred->encr_type & WPS_ENCR_TKIP)
|
||||
bss->wpa_pairwise |= WPA_CIPHER_TKIP;
|
||||
#endif /* CONFIG_NO_TKIP */
|
||||
bss->rsn_pairwise = bss->wpa_pairwise;
|
||||
|
@ -1181,8 +1180,7 @@ int hostapd_init_wps(struct hostapd_data *hapd,
|
|||
WPA_CIPHER_GCMP_256)) {
|
||||
wps->encr_types |= WPS_ENCR_AES;
|
||||
wps->encr_types_rsn |= WPS_ENCR_AES;
|
||||
}
|
||||
if (conf->rsn_pairwise & WPA_CIPHER_TKIP) {
|
||||
} else if (conf->rsn_pairwise & WPA_CIPHER_TKIP) {
|
||||
#ifdef CONFIG_NO_TKIP
|
||||
wpa_printf(MSG_INFO, "WPS: TKIP not supported");
|
||||
goto fail;
|
||||
|
|
Loading…
Add table
Reference in a new issue