| commit | 4e5f27c9e3847b0506b683c8a3f9e9b6a0f5509c | [log] [tgz] |
|---|---|---|
| author | Sunil Ravi <sunilravi@google.com> | Tue Jun 16 19:01:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 16 19:01:05 2020 +0000 |
| tree | 31d2c2134b60da7f9e439ea03dda51835621e185 | |
| parent | 27580e13fb75c519006c7f5bcbff4d48624c4011 [diff] | |
| parent | 77f2906a8d6094046b833fd28ca559de0d9170f5 [diff] |
hidl/1.3: Add missing check of SAE key management. am: 007d736cc0 am: ba0ae7d745 am: 77f2906a8d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/11881642 Change-Id: I3c6f6024a6d7ada6aa156beabc815ae7bcdeda72
diff --git a/wpa_supplicant/hidl/1.3/sta_network.cpp b/wpa_supplicant/hidl/1.3/sta_network.cpp index 925a093..5f3b491 100644 --- a/wpa_supplicant/hidl/1.3/sta_network.cpp +++ b/wpa_supplicant/hidl/1.3/sta_network.cpp
@@ -2450,7 +2450,8 @@ if (res == 0) { #ifdef CONFIG_IEEE80211R #ifdef CONFIG_SAE - if (capa.key_mgmt_iftype[WPA_IF_STATION] & WPA_DRIVER_CAPA_KEY_MGMT_FT_SAE) { + if ((key_mgmt_mask & WPA_KEY_MGMT_SAE) && + (capa.key_mgmt_iftype[WPA_IF_STATION] & WPA_DRIVER_CAPA_KEY_MGMT_FT_SAE)) { key_mgmt_mask |= WPA_KEY_MGMT_FT_SAE; } #endif