From ea8ff0f0f765ef2c69f949c6d41a76370c5a506f Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Tue, 3 Nov 2020 15:10:18 +0800 Subject: [PATCH] wifi: create a better name for WPA3 Enterprise 192-bit mode Bug: 170311014 Test: atest FrameworksWifiApiTests Change-Id: I1e31fa896d4890b78d3918247ee35cbfe7b08388 --- api/current.txt | 1 + wifi/api/current.txt | 1 + .../android/net/wifi/WifiConfiguration.java | 24 +++++++++++++++---- .../net/wifi/WifiNetworkSpecifier.java | 6 +++-- .../net/wifi/WifiNetworkSuggestion.java | 6 +++-- .../net/wifi/WifiConfigurationTest.java | 8 +++---- 6 files changed, 34 insertions(+), 12 deletions(-) diff --git a/api/current.txt b/api/current.txt index 711ca874152ae..fa47f0554b15b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/wifi/api/current.txt b/wifi/api/current.txt index 5c4e6157e1959..4c16cf492e39f 100644 --- a/wifi/api/current.txt +++ b/wifi/api/current.txt @@ -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 diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 2772bf9b75232..1e2e1228df51f 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -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); diff --git a/wifi/java/android/net/wifi/WifiNetworkSpecifier.java b/wifi/java/android/net/wifi/WifiNetworkSpecifier.java index f5ffd93d5fb68..be3b45d8c82a7 100644 --- a/wifi/java/android/net/wifi/WifiNetworkSpecifier.java +++ b/wifi/java/android/net/wifi/WifiNetworkSpecifier.java @@ -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( diff --git a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java index dc5189724c25a..61831ea9c5024 100644 --- a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java +++ b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java @@ -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( diff --git a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java index 624792405eca1..756c735b20f24 100644 --- a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java +++ b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java @@ -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);