diff options
| author | 2019-03-24 16:46:58 +0000 | |
|---|---|---|
| committer | 2019-03-24 16:46:58 +0000 | |
| commit | f8865bd2d8dc4d7bfa97a216f3642ac2dd86a81e (patch) | |
| tree | 7356219404d6fc7838f936c7302b22468dc9d4d4 | |
| parent | 2809f8fe1e72f38532342af1b9fdef5e54c3dfee (diff) | |
| parent | 90147e3222c243cad21521a83a493f78130066da (diff) | |
Merge "[WPA3] Initialize Suite-B ciphers correctly based on the CA cert type"
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 4 | ||||
| -rw-r--r-- | wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 476330052dcf..bdb9cfa7cf14 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -413,8 +413,8 @@ public class WifiConfiguration implements Parcelable { allowedKeyManagement.set(WifiConfiguration.KeyMgmt.SUITE_B_192); allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256); allowedGroupManagementCiphers.set(WifiConfiguration.GroupMgmtCipher.BIP_GMAC_256); - allowedSuiteBCiphers.set(WifiConfiguration.SuiteBCipher.ECDHE_ECDSA); - allowedSuiteBCiphers.set(WifiConfiguration.SuiteBCipher.ECDHE_RSA); + // Note: allowedSuiteBCiphers bitset will be set by the service once the + // certificates are attached to this profile requirePMF = true; break; case SECURITY_TYPE_OWE: diff --git a/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java b/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java index 2b0c7732e7ae..4dfa96b8c606 100644 --- a/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java +++ b/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java @@ -179,12 +179,10 @@ public class WifiNetworkSuggestionTest { .get(WifiConfiguration.GroupCipher.GCMP_256)); assertTrue(suggestion.wifiConfiguration.allowedGroupManagementCiphers .get(WifiConfiguration.GroupMgmtCipher.BIP_GMAC_256)); - assertTrue(suggestion.wifiConfiguration.allowedSuiteBCiphers - .get(WifiConfiguration.SuiteBCipher.ECDHE_ECDSA)); - assertTrue(suggestion.wifiConfiguration.allowedSuiteBCiphers - .get(WifiConfiguration.SuiteBCipher.ECDHE_RSA)); assertTrue(suggestion.wifiConfiguration.requirePMF); assertNull(suggestion.wifiConfiguration.preSharedKey); + // allowedSuiteBCiphers are set according to the loaded certificate and cannot be tested + // here. } /** |