mirror of
https://github.com/vanhoefm/fragattacks.git
synced 2024-11-25 00:38:24 -05:00
WPS: Convert WPA/TKIP-only to WPA+WPA2 mixed mode credential
This case of accepting WPA/TKIP-only credential based on internal registrar request to configure an AP to use TKIP was still remaining while all the WPS cases were supposed to enable mixed mode automatically. This is bit of a corner case since this is based on explicit local request to configure TKIP, but anyway, convert this one as well to allow WPA2/CCMP to be used. Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
parent
7162c6ecf5
commit
6255a8ac1f
@ -484,7 +484,7 @@ static int wpa_supplicant_wps_cred(void *ctx,
|
|||||||
case WPS_ENCR_NONE:
|
case WPS_ENCR_NONE:
|
||||||
break;
|
break;
|
||||||
case WPS_ENCR_TKIP:
|
case WPS_ENCR_TKIP:
|
||||||
ssid->pairwise_cipher = WPA_CIPHER_TKIP;
|
ssid->pairwise_cipher = WPA_CIPHER_TKIP | WPA_CIPHER_CCMP;
|
||||||
break;
|
break;
|
||||||
case WPS_ENCR_AES:
|
case WPS_ENCR_AES:
|
||||||
ssid->pairwise_cipher = WPA_CIPHER_CCMP;
|
ssid->pairwise_cipher = WPA_CIPHER_CCMP;
|
||||||
@ -525,7 +525,7 @@ static int wpa_supplicant_wps_cred(void *ctx,
|
|||||||
case WPS_AUTH_WPAPSK:
|
case WPS_AUTH_WPAPSK:
|
||||||
ssid->auth_alg = WPA_AUTH_ALG_OPEN;
|
ssid->auth_alg = WPA_AUTH_ALG_OPEN;
|
||||||
ssid->key_mgmt = WPA_KEY_MGMT_PSK;
|
ssid->key_mgmt = WPA_KEY_MGMT_PSK;
|
||||||
ssid->proto = WPA_PROTO_WPA;
|
ssid->proto = WPA_PROTO_WPA | WPA_PROTO_RSN;
|
||||||
break;
|
break;
|
||||||
case WPS_AUTH_WPA2PSK:
|
case WPS_AUTH_WPA2PSK:
|
||||||
ssid->auth_alg = WPA_AUTH_ALG_OPEN;
|
ssid->auth_alg = WPA_AUTH_ALG_OPEN;
|
||||||
|
Loading…
Reference in New Issue
Block a user