commit 9e5c5fca0a755f14daf668cb3b3ce712fba72938
author Chih-hung Hsieh <chh@google.com> Sat Dec 03 01:29:57 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Dec 03 01:29:57 2022 +0000
tree 9105f702ebf340a74f9458e5784f10f60e744892
parent e26c59fcd5243e1a4afb24373ef0c5d8716f52b2
parent 6ca59c4bfc5b8256033fe28af47cbd601628fb35

Merge "Suppress existing clang-tidy warnings" am: c3b41ba025 am: 6ca59c4bfc

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

Change-Id: Ica9b12b50e1de3f6e5c63dd03bb668dd04a021ca
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");