Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8edea74e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents d9ab124d 566101d1

src/com/android/settings/wifi/WifiConfigController.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

src/com/android/settings/wifi/WifiUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -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)) {