Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[WPA3] Initialize Suite-B ciphers correctly based on the CA cert type"

Browse Source
This commit is contained in:
Hai Shalom
2019-03-24 16:46:58 +00:00
committed by Android (Google) Code Review
parent 2809f8fe1e 90147e3222
commit f8865bd2d8
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -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:

6
wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java
View File

@@ -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.
}
/**