From 6255a8ac1f7016d2b1d089889917a131c0a4ef4d Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 17 Apr 2020 22:05:07 +0300 Subject: [PATCH] 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 --- wpa_supplicant/wps_supplicant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c index d34e059a8..b160fd0d4 100644 --- a/wpa_supplicant/wps_supplicant.c +++ b/wpa_supplicant/wps_supplicant.c @@ -484,7 +484,7 @@ static int wpa_supplicant_wps_cred(void *ctx, case WPS_ENCR_NONE: break; case WPS_ENCR_TKIP: - ssid->pairwise_cipher = WPA_CIPHER_TKIP; + ssid->pairwise_cipher = WPA_CIPHER_TKIP | WPA_CIPHER_CCMP; break; case WPS_ENCR_AES: ssid->pairwise_cipher = WPA_CIPHER_CCMP; @@ -525,7 +525,7 @@ static int wpa_supplicant_wps_cred(void *ctx, case WPS_AUTH_WPAPSK: ssid->auth_alg = WPA_AUTH_ALG_OPEN; ssid->key_mgmt = WPA_KEY_MGMT_PSK; - ssid->proto = WPA_PROTO_WPA; + ssid->proto = WPA_PROTO_WPA | WPA_PROTO_RSN; break; case WPS_AUTH_WPA2PSK: ssid->auth_alg = WPA_AUTH_ALG_OPEN;