aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Jeon <dennis.jeon@broadcom.com>2022-07-05 13:56:50 +0900
committerIsaac Chiou <isaacchiou@google.com>2022-08-11 02:59:50 +0000
commit2a960550e1504821a2feca553bea44514419de11 (patch)
tree5779d7c8c06f68f7c6804c47d1e6caebc7994a56
parent59fa4b44b84301ac01b937a6a0e687cf5dd3593a (diff)
downloadwpa_supplicant_8-2a960550e1504821a2feca553bea44514419de11.tar.gz
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 <dennis.jeon@broadcom.com>
-rw-r--r--wpa_supplicant/wpa_supplicant.c4
1 files changed, 3 insertions, 1 deletions
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");