PawletOS/app_Settings
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:
TreeHugger Robot
2019-03-26 16:14:17 +00:00
committed by Android (Google) Code Review
parent d9ab124d81 566101d166
commit 8edea74eda
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/WifiConfigController.java
View File

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

2
src/com/android/settings/wifi/WifiUtils.java
View File

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