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

Merge "wifi: create a better name for WPA3 Enterprise 192-bit mode"

Browse Source
This commit is contained in:
Jimmy Chen
2020-11-06 16:18:16 +00:00
committed by Android (Google) Code Review
parent 8ecfa7c3c2 ea8ff0f0f7
commit c8b48c97b3
6 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -31416,6 +31416,7 @@ package android.net.wifi {
field @Deprecated public static final int SECURITY_TYPE_EAP = 3; // 0x3
field @Deprecated public static final int SECURITY_TYPE_EAP_SUITE_B = 5; // 0x5
field @Deprecated public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE = 9; // 0x9
field @Deprecated public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT = 5; // 0x5
field @Deprecated public static final int SECURITY_TYPE_OPEN = 0; // 0x0
field @Deprecated public static final int SECURITY_TYPE_OWE = 6; // 0x6
field @Deprecated public static final int SECURITY_TYPE_PSK = 2; // 0x2

1
wifi/api/current.txt
View File

@@ -106,6 +106,7 @@ package android.net.wifi {
field @Deprecated public static final int SECURITY_TYPE_EAP = 3; // 0x3
field @Deprecated public static final int SECURITY_TYPE_EAP_SUITE_B = 5; // 0x5
field @Deprecated public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE = 9; // 0x9
field @Deprecated public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT = 5; // 0x5
field @Deprecated public static final int SECURITY_TYPE_OPEN = 0; // 0x0
field @Deprecated public static final int SECURITY_TYPE_OWE = 6; // 0x6
field @Deprecated public static final int SECURITY_TYPE_PSK = 2; // 0x2

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

@@ -439,8 +439,19 @@ public class WifiConfiguration implements Parcelable {
public static final int SECURITY_TYPE_EAP = 3;
/** Security type for an SAE network. */
public static final int SECURITY_TYPE_SAE = 4;
/** Security type for an EAP Suite B network. */
public static final int SECURITY_TYPE_EAP_SUITE_B = 5;
/**
* Security type for a WPA3-Enterprise in 192-bit security network.
* This is the same as {@link #SECURITY_TYPE_EAP_SUITE_B} and uses the same value.
*/
public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT = 5;
/**
* Security type for a WPA3-Enterprise in 192-bit security network.
* @deprecated Use the {@link #SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT} constant
* (which is the same value).
*/
@Deprecated
public static final int SECURITY_TYPE_EAP_SUITE_B =
SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT;
/** Security type for an OWE network. */
public static final int SECURITY_TYPE_OWE = 6;
/** Security type for a WAPI PSK network. */
@@ -466,6 +477,7 @@ public class WifiConfiguration implements Parcelable {
SECURITY_TYPE_WAPI_PSK,
SECURITY_TYPE_WAPI_CERT,
SECURITY_TYPE_EAP_WPA3_ENTERPRISE,
SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT,
})
public @interface SecurityType {}
@@ -483,7 +495,8 @@ public class WifiConfiguration implements Parcelable {
* {@link #SECURITY_TYPE_OWE},
* {@link #SECURITY_TYPE_WAPI_PSK},
* {@link #SECURITY_TYPE_WAPI_CERT},
* {@link #SECURITY_TYPE_EAP_WPA3_ENTERPRISE}
* {@link #SECURITY_TYPE_EAP_WPA3_ENTERPRISE},
* {@link #SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT}
*/
public void setSecurityParams(@SecurityType int securityType) {
// Clear all the bitsets.
@@ -522,7 +535,10 @@ public class WifiConfiguration implements Parcelable {
allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);
requirePmf = true;
break;
case SECURITY_TYPE_EAP_SUITE_B:
// The value of {@link SECURITY_TYPE_EAP_SUITE_B} is the same as
// {@link SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT}, remove it to avoid
// duplicate case label errors.
case SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT:
allowedProtocols.set(WifiConfiguration.Protocol.RSN);
allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP);
allowedKeyManagement.set(WifiConfiguration.KeyMgmt.IEEE8021X);

6
wifi/java/android/net/wifi/WifiNetworkSpecifier.java
View File

@@ -367,10 +367,12 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc
&& WifiEnterpriseConfig.isSuiteBCipherCert(
mWpa3EnterpriseConfig.getCaCertificate())) {
// WPA3-Enterprise in 192-bit security mode
configuration.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
configuration.setSecurityParams(
WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT);
} else if (mWpa3EnterpriseType == WPA3_ENTERPRISE_192_BIT) {
// WPA3-Enterprise in 192-bit security mode
configuration.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
configuration.setSecurityParams(
WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT);
} else {
// WPA3-Enterprise
configuration.setSecurityParams(

6
wifi/java/android/net/wifi/WifiNetworkSuggestion.java
View File

@@ -796,10 +796,12 @@ public final class WifiNetworkSuggestion implements Parcelable {
&& WifiEnterpriseConfig.isSuiteBCipherCert(
mWpa3EnterpriseConfig.getCaCertificate())) {
// WPA3-Enterprise in 192-bit security mode
configuration.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
configuration.setSecurityParams(
WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT);
} else if (mWpa3EnterpriseType == WPA3_ENTERPRISE_192_BIT) {
// WPA3-Enterprise in 192-bit security mode
configuration.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
configuration.setSecurityParams(
WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT);
} else {
// WPA3-Enterprise
configuration.setSecurityParams(

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

@@ -17,8 +17,8 @@
package android.net.wifi;
import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_EAP;
import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B;
import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE;
import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT;
import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_OPEN;
import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_OWE;
import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_PSK;
@@ -570,7 +570,7 @@ public class WifiConfigurationTest {
public void testSetSecurityParamsForSuiteB() throws Exception {
WifiConfiguration config = new WifiConfiguration();
config.setSecurityParams(SECURITY_TYPE_EAP_SUITE_B);
config.setSecurityParams(SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT);
assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SUITE_B_192));
assertTrue(config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_EAP));
@@ -666,7 +666,7 @@ public class WifiConfigurationTest {
configuration.setSecurityParams(SECURITY_TYPE_EAP_WPA3_ENTERPRISE);
assertFalse(configuration.needsPreSharedKey());
configuration.setSecurityParams(SECURITY_TYPE_EAP_SUITE_B);
configuration.setSecurityParams(SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT);
assertFalse(configuration.needsPreSharedKey());
}
@@ -695,7 +695,7 @@ public class WifiConfigurationTest {
configuration.setSecurityParams(SECURITY_TYPE_EAP_WPA3_ENTERPRISE);
assertEquals(KeyMgmt.WPA_EAP, configuration.getAuthType());
configuration.setSecurityParams(SECURITY_TYPE_EAP_SUITE_B);
configuration.setSecurityParams(SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT);
assertEquals(KeyMgmt.SUITE_B_192, configuration.getAuthType());
configuration.setSecurityParams(SECURITY_TYPE_WAPI_CERT);