aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-11-11 00:24:34 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-11-11 00:24:34 +0000
commit44cb96754a7ed70d38ef7491e03d8e6d8d4f3525 (patch)
tree33f6248efa72e3bbc85e6ea9961958958801bce3
parent2c7ce1811d3b774754682240ae65f9b20a2b79fd (diff)
parenta393081ada24225202fed08a94f0bb26b1035d80 (diff)
downloadwpa_supplicant_8-44cb96754a7ed70d38ef7491e03d8e6d8d4f3525.tar.gz
Snap for 9279354 from a393081ada24225202fed08a94f0bb26b1035d80 to tm-qpr2-release
Change-Id: I680144ecdff4291b3e508896dd920c43c0ab8c4f
-rw-r--r--wpa_supplicant/wpa_supplicant.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 4503ae99..05766b5b 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1909,7 +1909,8 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
if ((wpa_s->key_mgmt & WPA_KEY_MGMT_CROSS_AKM_ROAM) &&
IS_CROSS_AKM_ROAM_KEY_MGMT(ssid->key_mgmt) &&
(wpa_s->group_cipher == WPA_CIPHER_CCMP) &&
- (wpa_s->pairwise_cipher == WPA_CIPHER_CCMP)) {
+ (wpa_s->pairwise_cipher == WPA_CIPHER_CCMP) &&
+ (wpa_s->wpa_proto == WPA_PROTO_RSN)) {
wpa_s->key_mgmt = WPA_KEY_MGMT_SAE | WPA_KEY_MGMT_PSK;
wpa_dbg(wpa_s, MSG_INFO,
"WPA: Updating to KEY_MGMT SAE+PSK for seamless roaming");