Merge "[WPA3] Initialize Suite-B ciphers correctly based on the CA cert type"
This commit is contained in:
committed by
Android (Google) Code Review
commit
8edea74eda
@@ -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();
|
||||
|
@@ -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)) {
|
||||
|
Reference in New Issue
Block a user