From 37e10fd161075344135eaf7f8d9d5ef89e8fc747 Mon Sep 17 00:00:00 2001 From: Hai Shalom Date: Mon, 9 Mar 2020 12:07:22 -0700 Subject: [PATCH] Fix WPA3 Suite-B parameters in WifiConfiguration#setSecurityParams Add missing key management setup of IEEE8021X and WPA_EAP in WifiConfiguration#setSecurityParams. Bug: 151087842 Test: atest WifiConfigurationTest Change-Id: I3569853f229eb5d463a190c7cca6e4b6d7573bfe --- wifi/java/android/net/wifi/WifiConfiguration.java | 2 ++ wifi/tests/src/android/net/wifi/WifiConfigurationTest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 5a7bf4b15f1a6..ceb2907e7a93d 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -503,6 +503,8 @@ public class WifiConfiguration implements Parcelable { break; case SECURITY_TYPE_EAP_SUITE_B: allowedProtocols.set(WifiConfiguration.Protocol.RSN); + allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP); + allowedKeyManagement.set(WifiConfiguration.KeyMgmt.IEEE8021X); allowedKeyManagement.set(WifiConfiguration.KeyMgmt.SUITE_B_192); allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256); allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256); diff --git a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java index 047a64b257339..91c74f3c2e3ef 100644 --- a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java +++ b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java @@ -456,6 +456,8 @@ public class WifiConfigurationTest { config.setSecurityParams(SECURITY_TYPE_EAP_SUITE_B); assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SUITE_B_192)); + assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_EAP)); + assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.IEEE8021X)); assertTrue(config.allowedPairwiseCiphers.get(WifiConfiguration.PairwiseCipher.GCMP_256)); assertTrue(config.allowedGroupCiphers.get(WifiConfiguration.GroupCipher.GCMP_256)); assertTrue(config.allowedGroupManagementCiphers