commit bd908547788934b6b13d1793625f112f95ff96dd
author Sunil Ravi <sunilravi@google.com> Wed Feb 26 16:05:38 2020 -0800
committer Sunil Ravi <sunilravi@google.com> Thu Feb 27 00:47:18 2020 +0000
tree 80c035e5e04e8ad07a4a0b0211617cd9d3916cbc
parent b6aaecce75ee949b03da891a6a0c4ad382f7b4ee

hidl/1.2: Don't set WPA_KEY_MGMT_FT_SAE key management.

802.11r is not supported in current versions of
WPA3-Personal & WPA3-Enterprise. So don't set WPA_KEY_MGMT_FT_SAE
in wpa_ssid->key_mgmt, when station is trying to connect to SAE
supported Access Point.

Bug: 149865827
Test: Manual-Basic WiFi sanity test.
Change-Id: I6bc27af2d1a0a56931401f7e9a8e4b6493803eb6

wpa_supplicant/hidl/1.2/sta_network.cpp

diff --git a/wpa_supplicant/hidl/1.2/sta_network.cpp b/wpa_supplicant/hidl/1.2/sta_network.cpp
index 57622f8..4d694f7 100644
--- a/wpa_supplicant/hidl/1.2/sta_network.cpp
+++ b/wpa_supplicant/hidl/1.2/sta_network.cpp
@@ -2131,10 +2131,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;
 	}
@@ -2150,10 +2146,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;
 	}