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

Merge "Fix KeyMgmt.OSEN and Eap.UNAUTH_TLS handling" into rvc-dev am: 4dc071284f

Browse Source 
Change-Id: If28c62d30811af736b04db7622b4680732662256
This commit is contained in:
Automerger Merge Worker
2020-03-02 18:40:40 +00:00
parent a2e4315499 4dc071284f
commit e617377a56
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2554,6 +2554,8 @@ public class WifiConfiguration implements Parcelable {
key = SSID + KeyMgmt.strings[KeyMgmt.WAPI_PSK]; key = SSID + KeyMgmt.strings[KeyMgmt.WAPI_PSK];
} else if (allowedKeyManagement.get(KeyMgmt.WAPI_CERT)) { } else if (allowedKeyManagement.get(KeyMgmt.WAPI_CERT)) {
key = SSID + KeyMgmt.strings[KeyMgmt.WAPI_CERT]; key = SSID + KeyMgmt.strings[KeyMgmt.WAPI_CERT];
} else if (allowedKeyManagement.get(KeyMgmt.OSEN)) {
key = SSID + KeyMgmt.strings[KeyMgmt.OSEN];
} else { } else {
key = SSID + KeyMgmt.strings[KeyMgmt.NONE]; key = SSID + KeyMgmt.strings[KeyMgmt.NONE];
} }

2
wifi/java/android/net/wifi/WifiEnterpriseConfig.java
View File

@@ -482,7 +482,7 @@ public class WifiEnterpriseConfig implements Parcelable {
return false; return false;
} }
if (mEapMethod != Eap.TLS && mPhase2Method != Phase2.NONE) { if (mEapMethod != Eap.TLS && mEapMethod != Eap.UNAUTH_TLS && mPhase2Method != Phase2.NONE) {
boolean is_autheap = mEapMethod == Eap.TTLS && mPhase2Method == Phase2.GTC; boolean is_autheap = mEapMethod == Eap.TTLS && mPhase2Method == Phase2.GTC;
String prefix = is_autheap ? Phase2.AUTHEAP_PREFIX : Phase2.AUTH_PREFIX; String prefix = is_autheap ? Phase2.AUTHEAP_PREFIX : Phase2.AUTH_PREFIX;
String value = convertToQuotedString(prefix + Phase2.strings[mPhase2Method]); String value = convertToQuotedString(prefix + Phase2.strings[mPhase2Method]);

19
wifi/tests/src/android/net/wifi/WifiEnterpriseConfigTest.java
View File

@@ -521,4 +521,23 @@ public class WifiEnterpriseConfigTest {
// expected exception. // expected exception.
} }
} }
/** Verifies that the EAP inner method is reset when we switch to Unauth-TLS */
@Test
public void eapPhase2MethodForUnauthTls() {
// Initially select an EAP method that supports an phase2.
mEnterpriseConfig.setEapMethod(Eap.PEAP);
mEnterpriseConfig.setPhase2Method(Phase2.MSCHAPV2);
assertEquals("PEAP", getSupplicantEapMethod());
assertEquals("\"auth=MSCHAPV2\"", getSupplicantPhase2Method());
// Change the EAP method to another type which supports a phase2.
mEnterpriseConfig.setEapMethod(Eap.TTLS);
assertEquals("TTLS", getSupplicantEapMethod());
assertEquals("\"auth=MSCHAPV2\"", getSupplicantPhase2Method());
// Change the EAP method to Unauth-TLS which does not support a phase2.
mEnterpriseConfig.setEapMethod(Eap.UNAUTH_TLS);
assertEquals(null, getSupplicantPhase2Method());
}
} }