Merge "[WPA3] Add missing SUITE_B_192 to getKeyIdForCredentials" (a89f1cae) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -2080,7 +2080,7 @@ public class WifiConfiguration implements Parcelable {
		* @hide
		*/
		public String getKeyIdForCredentials(WifiConfiguration current) {
		String keyMgmt = null;
		String keyMgmt = "";

		try {
		// Get current config details for fields that are not initialized
		@@ -2089,14 +2089,17 @@ public class WifiConfiguration implements Parcelable {
		allowedKeyManagement = current.allowedKeyManagement;
		}
		if (allowedKeyManagement.get(KeyMgmt.WPA_EAP)) {
		keyMgmt = KeyMgmt.strings[KeyMgmt.WPA_EAP];
		keyMgmt += KeyMgmt.strings[KeyMgmt.WPA_EAP];
		}
		if (allowedKeyManagement.get(KeyMgmt.OSEN)) {
		keyMgmt = KeyMgmt.strings[KeyMgmt.OSEN];
		keyMgmt += KeyMgmt.strings[KeyMgmt.OSEN];
		}
		if (allowedKeyManagement.get(KeyMgmt.IEEE8021X)) {
		keyMgmt += KeyMgmt.strings[KeyMgmt.IEEE8021X];
		}
		if (allowedKeyManagement.get(KeyMgmt.SUITE_B_192)) {
		keyMgmt += KeyMgmt.strings[KeyMgmt.SUITE_B_192];
		}

		if (TextUtils.isEmpty(keyMgmt)) {
		throw new IllegalStateException("Not an EAP network");

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

+55 −0

Original line number	Diff line number	Diff line
		@@ -293,4 +293,59 @@ public class WifiConfigurationTest {
		assertEquals(config.apChannel, restoredConfig.apChannel);
		assertEquals(config.hiddenSSID, restoredConfig.hiddenSSID);
		}


		/**
		* Verifies that getKeyIdForCredentials returns the expected string for Enterprise networks
		* @throws Exception
		*/
		@Test
		public void testGetKeyIdForCredentials() throws Exception {
		WifiConfiguration config = new WifiConfiguration();
		final String mSsid = "TestAP";
		config.SSID = mSsid;

		// Test various combinations
		// EAP with TLS
		config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
		config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TLS);
		config.enterpriseConfig.setPhase2Method(WifiEnterpriseConfig.Phase2.NONE);
		String keyId = config.getKeyIdForCredentials(config);
		assertEquals(keyId, mSsid + "_WPA_EAP_TLS_NULL");

		// EAP with TTLS & MSCHAPv2
		config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
		config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TTLS);
		config.enterpriseConfig.setPhase2Method(WifiEnterpriseConfig.Phase2.MSCHAPV2);
		keyId = config.getKeyIdForCredentials(config);
		assertEquals(keyId, mSsid + "_WPA_EAP_TTLS_MSCHAPV2");

		// Suite-B 192 with PWD & GTC
		config.allowedKeyManagement.clear();
		config.allowedKeyManagement.set(KeyMgmt.SUITE_B_192);
		config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.PWD);
		config.enterpriseConfig.setPhase2Method(WifiEnterpriseConfig.Phase2.GTC);
		keyId = config.getKeyIdForCredentials(config);
		assertEquals(keyId, mSsid + "_SUITE_B_192_PWD_GTC");

		// IEEE8021X with SIM
		config.allowedKeyManagement.clear();
		config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
		config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.SIM);
		config.enterpriseConfig.setPhase2Method(WifiEnterpriseConfig.Phase2.NONE);
		keyId = config.getKeyIdForCredentials(config);
		assertEquals(keyId, mSsid + "_IEEE8021X_SIM_NULL");

		// Try calling this method with non-Enterprise network, expect an exception
		boolean exceptionThrown = false;
		try {
		config.allowedKeyManagement.clear();
		config.allowedKeyManagement.set(KeyMgmt.WPA2_PSK);
		config.preSharedKey = "TestPsk";
		keyId = config.getKeyIdForCredentials(config);
		} catch (IllegalStateException e) {
		exceptionThrown = true;
		}
		assertTrue(exceptionThrown);
		}
		}