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

Commit 30de095d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[SAE] Connect to networks with GCMP_256 cipher" into rvc-dev am: ceafa21e 

Change-Id: I38ffb1c82a3d78a369931c33b4f4e0bf47a4be18
parents 6dd3bdf7 ceafa21e

wifi/java/android/net/wifi/WifiConfiguration.java

+4 −0
Original line number Diff line number Diff line
@@ -498,7 +498,9 @@ public class WifiConfiguration implements Parcelable { 
                allowedProtocols.set(WifiConfiguration.Protocol.RSN);

                allowedKeyManagement.set(WifiConfiguration.KeyMgmt.SAE);

                allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);

                allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256);

                allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);

                allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);

                requirePmf = true;

                break;

            case SECURITY_TYPE_EAP_SUITE_B:
@@ -517,7 +519,9 @@ public class WifiConfiguration implements Parcelable { 
                allowedProtocols.set(WifiConfiguration.Protocol.RSN);

                allowedKeyManagement.set(WifiConfiguration.KeyMgmt.OWE);

                allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);

                allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256);

                allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);

                allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);

                requirePmf = true;

                break;

            case SECURITY_TYPE_WAPI_PSK:

wifi/tests/src/android/net/wifi/WifiConfigurationTest.java

+4 −0
Original line number Diff line number Diff line
@@ -423,7 +423,9 @@ public class WifiConfigurationTest { 


        assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SAE));

        assertTrue(config.allowedPairwiseCiphers.get(WifiConfiguration.PairwiseCipher.CCMP));

        assertTrue(config.allowedPairwiseCiphers.get(WifiConfiguration.PairwiseCipher.GCMP_256));

        assertTrue(config.allowedGroupCiphers.get(WifiConfiguration.GroupCipher.CCMP));

        assertTrue(config.allowedGroupCiphers.get(WifiConfiguration.GroupCipher.GCMP_256));

        assertTrue(config.requirePmf);

    }
@@ -440,7 +442,9 @@ public class WifiConfigurationTest { 


        assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.OWE));

        assertTrue(config.allowedPairwiseCiphers.get(WifiConfiguration.PairwiseCipher.CCMP));

        assertTrue(config.allowedPairwiseCiphers.get(WifiConfiguration.PairwiseCipher.GCMP_256));

        assertTrue(config.allowedGroupCiphers.get(WifiConfiguration.GroupCipher.CCMP));

        assertTrue(config.allowedGroupCiphers.get(WifiConfiguration.GroupCipher.GCMP_256));

        assertTrue(config.requirePmf);

    }