From 006ba183f6bf4e70d8fa80e86a424b7716eeb9d5 Mon Sep 17 00:00:00 2001 From: Yan Yan Date: Fri, 19 Aug 2022 17:55:20 +0000 Subject: Revert "Add three new IKE options in IkeSessionParamsUtils" This reverts commit de1dca7c7609a09e83f0c1f58fd9b19024bbbfe1. Reason for revert: This commit will be cherry picked for QPR release and is accessing new IPsec API constants that will not be released until mainline October train. This commit fails to maintain the compatibility with IPsec module that is older than the October version. Bug: 242231517 Test: atest IkeSessionParamsUtilsTest Change-Id: Iff0dcc32025dad3016257655205beaf2e842f24c --- .../IkeSessionParamsUtils.java | 10 ------ .../IkeSessionParamsUtilsTest.java | 36 +++++++++------------- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java b/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java index b2e75a36c3ea..be573721936b 100644 --- a/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java +++ b/core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java @@ -72,13 +72,6 @@ public final class IkeSessionParamsUtils { private static final String NATT_KEEPALIVE_DELAY_SEC_KEY = "NATT_KEEPALIVE_DELAY_SEC_KEY"; private static final String IKE_OPTIONS_KEY = "IKE_OPTIONS_KEY"; - // TODO: Use the IKE API when they are exposed - @VisibleForTesting(visibility = Visibility.PRIVATE) - public static final int IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION = 6; - - @VisibleForTesting(visibility = Visibility.PRIVATE) - public static final int IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES = 7; - private static final Set IKE_OPTIONS = new ArraySet<>(); static { @@ -87,9 +80,6 @@ public final class IkeSessionParamsUtils { IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_MOBIKE); IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_FORCE_PORT_4500); IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_INITIAL_CONTACT); - IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_REKEY_MOBILITY); - IKE_OPTIONS.add(IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION); - IKE_OPTIONS.add(IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES); } /** Serializes an IkeSessionParams to a PersistableBundle. */ diff --git a/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java b/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java index d2f0a20fc3b2..3b201f9d20dd 100644 --- a/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java +++ b/tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java @@ -134,33 +134,13 @@ public class IkeSessionParamsUtilsTest { verifyPersistableBundleEncodeDecodeIsLossless(params); } - private static IkeSessionParams.Builder createBuilderMinimumWithEap() throws Exception { - final X509Certificate serverCaCert = createCertFromPemFile("self-signed-ca.pem"); - - final byte[] eapId = "test@android.net".getBytes(StandardCharsets.US_ASCII); - final int subId = 1; - final EapSessionConfig eapConfig = - new EapSessionConfig.Builder() - .setEapIdentity(eapId) - .setEapSimConfig(subId, APPTYPE_USIM) - .setEapAkaConfig(subId, APPTYPE_USIM) - .build(); - return createBuilderMinimum().setAuthEap(serverCaCert, eapConfig); - } - @Test public void testEncodeDecodeParamsWithIkeOptions() throws Exception { final IkeSessionParams params = - createBuilderMinimumWithEap() + createBuilderMinimum() .addIkeOption(IkeSessionParams.IKE_OPTION_ACCEPT_ANY_REMOTE_ID) - .addIkeOption(IkeSessionParams.IKE_OPTION_EAP_ONLY_AUTH) .addIkeOption(IkeSessionParams.IKE_OPTION_MOBIKE) - .addIkeOption(IkeSessionParams.IKE_OPTION_FORCE_PORT_4500) .addIkeOption(IkeSessionParams.IKE_OPTION_INITIAL_CONTACT) - .addIkeOption(IkeSessionParams.IKE_OPTION_REKEY_MOBILITY) - .addIkeOption( - IkeSessionParamsUtils.IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION) - .addIkeOption(IkeSessionParamsUtils.IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES) .build(); verifyPersistableBundleEncodeDecodeIsLossless(params); } @@ -196,7 +176,19 @@ public class IkeSessionParamsUtilsTest { @Test public void testEncodeRecodeParamsWithEapAuth() throws Exception { - final IkeSessionParams params = createBuilderMinimumWithEap().build(); + final X509Certificate serverCaCert = createCertFromPemFile("self-signed-ca.pem"); + + final byte[] eapId = "test@android.net".getBytes(StandardCharsets.US_ASCII); + final int subId = 1; + final EapSessionConfig eapConfig = + new EapSessionConfig.Builder() + .setEapIdentity(eapId) + .setEapSimConfig(subId, APPTYPE_USIM) + .setEapAkaConfig(subId, APPTYPE_USIM) + .build(); + + final IkeSessionParams params = + createBuilderMinimum().setAuthEap(serverCaCert, eapConfig).build(); verifyPersistableBundleEncodeDecodeIsLossless(params); } } -- cgit v1.2.3-59-g8ed1b