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

This commit is contained in:
TreeHugger Robot
2019-03-26 16:14:17 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -637,7 +637,7 @@ public class WifiConfigController implements TextWatcher,
config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);
config.allowedGroupManagementCiphers.set(WifiConfiguration.GroupMgmtCipher
.BIP_GMAC_256);
config.allowedSuiteBCiphers.set(WifiConfiguration.SuiteBCipher.ECDHE_RSA);
// allowedSuiteBCiphers will be set according to certificate type
}
config.enterpriseConfig = new WifiEnterpriseConfig();
int eapMethod = mEapMethodSpinner.getSelectedItemPosition();

View File

@@ -198,7 +198,7 @@ public class WifiUtils {
config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);
config.allowedGroupManagementCiphers.set(WifiConfiguration.GroupMgmtCipher
.BIP_GMAC_256);
config.allowedSuiteBCiphers.set(WifiConfiguration.SuiteBCipher.ECDHE_RSA);
// allowedSuiteBCiphers will be set according to certificate type
}
if (!TextUtils.isEmpty(password)) {