commit bb3144840aca8d25cc1f020d8ca62e59b0133542
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Nov 11 03:20:44 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Nov 11 03:20:44 2022 +0000
tree 33f6248efa72e3bbc85e6ea9961958958801bce3
parent 4e3b6cf899c3a80fcc996dc1376da992bb32902b
parent a393081ada24225202fed08a94f0bb26b1035d80

Snap for 9279354 from a393081ada24225202fed08a94f0bb26b1035d80 to tm-d4-release

Change-Id: Iee35b31907b45010d8d431e75258033832009506

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");