| commit | a6df95fd01e2a368ac4d84d44972676e48f88c41 | [log] [tgz] |
|---|---|---|
| author | Isaac Chiou <isaacchiou@google.com> | Fri Sep 02 05:44:02 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 02 05:44:02 2022 +0000 |
| tree | 79cfedf4498421942bfc0a5f7e90574f5c8e383b | |
| parent | 99d87740aee17e51eb2d03a47a07bc0e8ca04f36 [diff] | |
| parent | 446ff6767bc18290430b8f97bb9307c6695272ab [diff] |
Merge "Fixed multiple AKMs to be support CCMP only" into tm-qpr-dev am: 446ff6767b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/19175661 Change-Id: I28fd2bf7454105342ea611ee85dc79fafac7ac0e 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 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");