commit e26c59fcd5243e1a4afb24373ef0c5d8716f52b2
author Treehugger Robot <treehugger-gerrit@google.com> Sat Nov 19 21:32:27 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Nov 19 21:32:27 2022 +0000
tree aff81cce690c5796be3afb049c32332542da8602
parent 0a1d323cf351c2b3cd9b4e6bf1ec9b6c843633fc
parent e9dcef1be7e99654be6937d48fe6fe2eaaf80f5e

Merge "Decalre a soong module for hostapd manifest" am: 725fbcfacb am: e9dcef1be7

Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/2308420

Change-Id: Ifb7c7c817e4a798b921f556839575018a5a81ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

wpa_supplicant/wpa_supplicant.c

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 4503ae9..05766b5 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1909,7 +1909,8 @@
 	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");