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

Merge "Fix up EAP-SIM documentation" am: 2142b14a88 am: 32655dfa19

Browse Source 
am: 5e10f3d8e3

Change-Id: Idecbc5f6e85c35c8f648dda005d701bf4ebdec82
This commit is contained in:
Paul Stewart
2017-03-02 00:27:33 +00:00
committed by android-build-merger
parent 43d059bf48 5e10f3d8e3
commit b26979f14e
2 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,11 +236,11 @@ public class WifiEnterpriseConfig implements Parcelable {
public static final int TTLS = 2;
/** EAP-Password */
public static final int PWD = 3;
/** EAP-Subscriber Identity Module */
/** EAP-Subscriber Identity Module [RFC-4186] */
public static final int SIM = 4;
/** EAP-Authentication and Key Agreement */
/** EAP-Authentication and Key Agreement [RFC-4187] */
public static final int AKA = 5;
/** EAP-Authentication and Key Agreement Prime */
/** EAP-Authentication and Key Agreement Prime [RFC-5448] */
public static final int AKA_PRIME = 6;
/** Hotspot 2.0 r2 OSEN */
public static final int UNAUTH_TLS = 7;
@@ -263,11 +263,11 @@ public class WifiEnterpriseConfig implements Parcelable {
public static final int MSCHAPV2 = 3;
/** Generic Token Card */
public static final int GTC = 4;
/** EAP-Subscriber Identity Module */
/** EAP-Subscriber Identity Module [RFC-4186] */
public static final int SIM = 5;
/** EAP-Authentication and Key Agreement */
/** EAP-Authentication and Key Agreement [RFC-4187] */
public static final int AKA = 6;
/** EAP-Authentication and Key Agreement Prime */
/** EAP-Authentication and Key Agreement Prime [RFC-5448] */
public static final int AKA_PRIME = 7;
private static final String AUTH_PREFIX = "auth=";
private static final String AUTHEAP_PREFIX = "autheap=";
@@ -756,8 +756,8 @@ public class WifiEnterpriseConfig implements Parcelable {
* key entry when the config is saved and removing the key entry when
* the config is removed.
* @param privateKey
* @param clientCertificate
* @param privateKey a PrivateKey instance for the end certificate.
* @param clientCertificate an X509Certificate representing the end certificate.
* @throws IllegalArgumentException for an invalid key or certificate.
*/
public void setClientKeyEntry(PrivateKey privateKey, X509Certificate clientCertificate) {
@@ -775,9 +775,11 @@ public class WifiEnterpriseConfig implements Parcelable {
* with this configuration. The framework takes care of installing the
* key entry when the config is saved and removing the key entry when
* the config is removed.
* @param privateKey
* @param clientCertificateChain
*
* @param privateKey a PrivateKey instance for the end certificate.
* @param clientCertificateChain an array of X509Certificate instances which starts with
* end certificate and continues with additional CA certificates necessary to
* link the end certificate with some root certificate known by the authenticator.
* @throws IllegalArgumentException for an invalid key or certificate.
*/
public void setClientKeyEntryWithCertificateChain(PrivateKey privateKey,
@@ -835,7 +837,15 @@ public class WifiEnterpriseConfig implements Parcelable {
}
/**
* Get the complete client certificate chain
* Get the complete client certificate chain in the same order as it was last supplied.
*
* <p>If the chain was last supplied by a call to
* {@link #setClientKeyEntry(java.security.PrivateKey, java.security.cert.X509Certificate)}
* with a non-null * certificate instance, a single-element array containing the certificate
* will be * returned. If {@link #setClientKeyEntryWithCertificateChain(
* java.security.PrivateKey, java.security.cert.X509Certificate[])} was last called with a
* non-empty array, this array will be returned in the same order as it was supplied.
* Otherwise, {@code null} will be returned.
*
* @return X.509 client certificates
*/

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

@@ -89,11 +89,29 @@ public class WifiEnterpriseConfigTest {
@Test
public void testSetClientKeyEntryWithNull() {
mEnterpriseConfig.setClientKeyEntry(null, null);
assertEquals(null, mEnterpriseConfig.getClientCertificateChain());
assertEquals(null, mEnterpriseConfig.getClientCertificate());
assertNull(mEnterpriseConfig.getClientCertificateChain());
assertNull(mEnterpriseConfig.getClientCertificate());
mEnterpriseConfig.setClientKeyEntryWithCertificateChain(null, null);
assertEquals(null, mEnterpriseConfig.getClientCertificateChain());
assertEquals(null, mEnterpriseConfig.getClientCertificate());
assertNull(mEnterpriseConfig.getClientCertificateChain());
assertNull(mEnterpriseConfig.getClientCertificate());
// Setting the client certificate to null should clear the existing chain.
PrivateKey clientKey = FakeKeys.RSA_KEY1;
X509Certificate clientCert0 = FakeKeys.CLIENT_CERT;
X509Certificate clientCert1 = FakeKeys.CA_CERT1;
mEnterpriseConfig.setClientKeyEntry(clientKey, clientCert0);
assertNotNull(mEnterpriseConfig.getClientCertificate());
mEnterpriseConfig.setClientKeyEntry(null, null);
assertNull(mEnterpriseConfig.getClientCertificate());
assertNull(mEnterpriseConfig.getClientCertificateChain());
// Setting the chain to null should clear the existing chain.
X509Certificate[] clientChain = new X509Certificate[] {clientCert0, clientCert1};
mEnterpriseConfig.setClientKeyEntryWithCertificateChain(clientKey, clientChain);
assertNotNull(mEnterpriseConfig.getClientCertificateChain());
mEnterpriseConfig.setClientKeyEntryWithCertificateChain(null, null);
assertNull(mEnterpriseConfig.getClientCertificate());
assertNull(mEnterpriseConfig.getClientCertificateChain());
}
@Test