Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hai Shalom
2020-03-11 00:22:04 +00:00
committed by Android (Google) Code Review
parent 76182efa9f e1562532fe
commit ceafa21efa
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -498,7 +498,9 @@ public class WifiConfiguration implements Parcelable {
allowedProtocols.set(WifiConfiguration.Protocol.RSN); allowedProtocols.set(WifiConfiguration.Protocol.RSN);
allowedKeyManagement.set(WifiConfiguration.KeyMgmt.SAE); allowedKeyManagement.set(WifiConfiguration.KeyMgmt.SAE);
allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP); allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256);
allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP); allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);
requirePmf = true; requirePmf = true;
break; break;
case SECURITY_TYPE_EAP_SUITE_B: case SECURITY_TYPE_EAP_SUITE_B:
@@ -517,7 +519,9 @@ public class WifiConfiguration implements Parcelable {
allowedProtocols.set(WifiConfiguration.Protocol.RSN); allowedProtocols.set(WifiConfiguration.Protocol.RSN);
allowedKeyManagement.set(WifiConfiguration.KeyMgmt.OWE); allowedKeyManagement.set(WifiConfiguration.KeyMgmt.OWE);
allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP); allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256);
allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP); allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);
requirePmf = true; requirePmf = true;
break; break;
case SECURITY_TYPE_WAPI_PSK: case SECURITY_TYPE_WAPI_PSK:

4
wifi/tests/src/android/net/wifi/WifiConfigurationTest.java
View File

@@ -423,7 +423,9 @@ public class WifiConfigurationTest {
assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SAE)); assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SAE));
assertTrue(config.allowedPairwiseCiphers.get(WifiConfiguration.PairwiseCipher.CCMP)); 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.CCMP));
assertTrue(config.allowedGroupCiphers.get(WifiConfiguration.GroupCipher.GCMP_256));
assertTrue(config.requirePmf); assertTrue(config.requirePmf);
} }
@@ -440,7 +442,9 @@ public class WifiConfigurationTest {
assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.OWE)); assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.OWE));
assertTrue(config.allowedPairwiseCiphers.get(WifiConfiguration.PairwiseCipher.CCMP)); 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.CCMP));
assertTrue(config.allowedGroupCiphers.get(WifiConfiguration.GroupCipher.GCMP_256));
assertTrue(config.requirePmf); assertTrue(config.requirePmf);
} }