Expose EAP-TTLS in IPsec module APIs.
Bug: 173122059
Test: atest FrameworksIkeTests
Change-Id: I43906454887e278b53b3293ce2191de65b7f4238
diff --git a/api/current.txt b/api/current.txt
index b150294..f47f205 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7,6 +7,7 @@
method @NonNull public byte[] getEapIdentity();
method @Nullable public android.net.eap.EapSessionConfig.EapMsChapV2Config getEapMsChapV2Config();
method @Nullable public android.net.eap.EapSessionConfig.EapSimConfig getEapSimConfig();
+ method @Nullable public android.net.eap.EapSessionConfig.EapTtlsConfig getEapTtlsConfig();
}
public static final class EapSessionConfig.Builder {
@@ -17,6 +18,7 @@
method @NonNull public android.net.eap.EapSessionConfig.Builder setEapIdentity(@NonNull byte[]);
method @NonNull public android.net.eap.EapSessionConfig.Builder setEapMsChapV2Config(@NonNull String, @NonNull String);
method @NonNull public android.net.eap.EapSessionConfig.Builder setEapSimConfig(int, int);
+ method @NonNull public android.net.eap.EapSessionConfig.Builder setEapTtlsConfig(@Nullable java.security.cert.X509Certificate, @NonNull android.net.eap.EapSessionConfig);
}
public static class EapSessionConfig.EapAkaConfig extends android.net.eap.EapSessionConfig.EapMethodConfig {
@@ -43,6 +45,11 @@
method public int getSubId();
}
+ public static class EapSessionConfig.EapTtlsConfig extends android.net.eap.EapSessionConfig.EapMethodConfig {
+ method @NonNull public android.net.eap.EapSessionConfig getInnerEapSessionConfig();
+ method @Nullable public java.security.cert.X509Certificate getServerCaCert();
+ }
+
}
package android.net.ipsec.ike {
diff --git a/src/java/android/net/eap/EapSessionConfig.java b/src/java/android/net/eap/EapSessionConfig.java
index cfa2fcc..aeea7bc 100644
--- a/src/java/android/net/eap/EapSessionConfig.java
+++ b/src/java/android/net/eap/EapSessionConfig.java
@@ -194,7 +194,6 @@
* Retrieves configuration for EAP-TTLS
*
* @return the configuration for EAP-TTLS, or null if it was not set
- * @hide
*/
@Nullable
public EapTtlsConfig getEapTtlsConfig() {
@@ -308,9 +307,9 @@
}
/**
- * Sets the configuration for EAP-TTLS
+ * Sets the configuration for EAP-TTLS.
*
- * <p>Nested tunnel authentications are disallowed.
+ * <p>Tunneled EAP-TTLS authentications are disallowed.
*
* @param serverCaCert the CA certificate for validating the received server certificate(s).
* If a certificate is provided, it MUST be the root CA used by the server, or
@@ -318,7 +317,6 @@
* truststore is considered acceptable.
* @param innerEapSessionConfig represents the configuration for the inner EAP instance
* @return Builder this, to facilitate chaining
- * @hide
*/
@NonNull
public Builder setEapTtlsConfig(
@@ -762,8 +760,6 @@
/**
* EapTtlsConfig represents the configs needed for an EAP-TTLS session.
- *
- * @hide
*/
public static class EapTtlsConfig extends EapMethodConfig {
private static final String TRUST_CERT_KEY = "TRUST_CERT_KEY";
@@ -854,7 +850,6 @@
*
* @return the CA certificate for validating the received server certificate or null if the
* system default is preferred
- * @hide
*/
@Nullable
public X509Certificate getServerCaCert() {
@@ -865,7 +860,6 @@
* Retrieves the inner EAP session config
*
* @return an EapSessionConfig representing the config for tunneled EAP authentication
- * @hide
*/
@NonNull
public EapSessionConfig getInnerEapSessionConfig() {
