commit c22f95f6c4f3da120c2b40d98860573358d724ed
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 28 02:17:00 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 28 02:17:00 2020 +0000
tree 04a10e3a56ef7b7b5a0f75a417b3c57940d2f443
parent 01a8f78043fc03b96b9046e21a0d7ba361ba3dab
parent 8003210bb766b6e06d1391eefc0afde09a25af56

hidl/1.3: Don't set WPA_KEY_MGMT_FT_SAE key management. am: 8003210bb7

Change-Id: Id23dbd6f21fe7d4ccd0bcc16c60cda94e6bb037c

wpa_supplicant/hidl/1.3/sta_network.cpp

diff --git a/wpa_supplicant/hidl/1.3/sta_network.cpp b/wpa_supplicant/hidl/1.3/sta_network.cpp
index c96368a..4e492b5 100644
--- a/wpa_supplicant/hidl/1.3/sta_network.cpp
+++ b/wpa_supplicant/hidl/1.3/sta_network.cpp
@@ -2363,10 +2363,6 @@
  */
 void StaNetwork::setFastTransitionKeyMgmt(uint32_t &key_mgmt_mask)
 {
-	if (key_mgmt_mask & WPA_KEY_MGMT_SAE) {
-		key_mgmt_mask |= WPA_KEY_MGMT_FT_SAE;
-	}
-
 	if (key_mgmt_mask & WPA_KEY_MGMT_PSK) {
 		key_mgmt_mask |= WPA_KEY_MGMT_FT_PSK;
 	}
@@ -2382,10 +2378,6 @@
  */
 void StaNetwork::resetFastTransitionKeyMgmt(uint32_t &key_mgmt_mask)
 {
-	if (key_mgmt_mask & WPA_KEY_MGMT_SAE) {
-		key_mgmt_mask &= ~WPA_KEY_MGMT_FT_SAE;
-	}
-
 	if (key_mgmt_mask & WPA_KEY_MGMT_PSK) {
 		key_mgmt_mask &= ~WPA_KEY_MGMT_FT_PSK;
 	}