commit 446ff6767bc18290430b8f97bb9307c6695272ab
author Isaac Chiou <isaacchiou@google.com> Fri Sep 02 05:18:48 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 02 05:18:48 2022 +0000
tree 6a046fc2e04d389490923121ac9eb19f5edc8833
parent 1651ba620e34139a4918ded4af6b9788c3d7dca6
parent 2a960550e1504821a2feca553bea44514419de11

Merge "Fixed multiple AKMs to be support CCMP only" into tm-qpr-dev

wpa_supplicant/wpa_supplicant.c

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index cb42994..4503ae9 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1907,7 +1907,9 @@
 
 #ifdef CONFIG_DRIVER_NL80211_BRCM
 	if ((wpa_s->key_mgmt & WPA_KEY_MGMT_CROSS_AKM_ROAM) &&
-	    IS_CROSS_AKM_ROAM_KEY_MGMT(ssid->key_mgmt)) {
+		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->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");