| commit | 466eb7762ee2105ef186284880cdfefe32faa495 | [log] [tgz] |
|---|---|---|
| author | Isaac Chiou <isaacchiou@google.com> | Fri Sep 02 06:17:19 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 02 06:17:19 2022 +0000 |
| tree | 1d20580d9cf9a2f3f6079d9e562bd57f1bbd072a | |
| parent | 8c6738f3cba3acf44dbc89634e9d78d6db5a4d45 [diff] | |
| parent | a6df95fd01e2a368ac4d84d44972676e48f88c41 [diff] |
Merge "Fixed multiple AKMs to be support CCMP only" into tm-qpr-dev am: 446ff6767b am: a6df95fd01 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/19175661 Change-Id: Iead2251c86d5d4396400201d4884b004a74c7e2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 78efba0..c63f3b2 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c
@@ -1908,7 +1908,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");