From 2a960550e1504821a2feca553bea44514419de11 Mon Sep 17 00:00:00 2001 From: Dennis Jeon Date: Tue, 5 Jul 2022 13:56:50 +0900 Subject: Fixed multiple AKMs to be support CCMP only Fixed to not use multiple AKMs when connecting to an AP set with TKIP Bug: 237362902 Test: AU drop test Change-Id: I8d1d66c71d2b8a362d0bddb50f7ca5e012961e69 Signed-off-by: Dennis Jeon --- wpa_supplicant/wpa_supplicant.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 24c8818f..30c70490 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1907,7 +1907,9 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s, #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"); -- cgit v1.2.3