diff options
author | evitayan <evitayan@google.com> | 2019-10-03 13:16:31 -0700 |
---|---|---|
committer | evitayan <evitayan@google.com> | 2019-10-07 15:13:57 -0700 |
commit | dad274987229a29cf6078b7240418a74b67e8e5a (patch) | |
tree | ff2a66c0bfb11afb01240c1d198a30b442c6f887 /tests/iketests/src/java/com/android/ike/ikev2 | |
parent | 8da4b86e0310297f05776b8423e0dc1779f85889 (diff) | |
download | ike-dad274987229a29cf6078b7240418a74b67e8e5a.tar.gz |
Refactor SaProposal
Make SaProposal abstract and create subclasses IkeSaProposal and
ChildProposal for IKE and Child negotiation separately.
Bug: 142139930
Test: atest FrameworksIkeTests(all passed)
Change-Id: I3bb7ad679228ff6f88e42b18a80ecc9db0576e3e
Diffstat (limited to 'tests/iketests/src/java/com/android/ike/ikev2')
6 files changed, 76 insertions, 121 deletions
diff --git a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionOptionsTest.java b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionOptionsTest.java index fab0e54a..185848b0 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionOptionsTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionOptionsTest.java @@ -29,8 +29,8 @@ public final class ChildSessionOptionsTest { @Test public void testBuild() throws Exception { - SaProposal saProposal = - SaProposal.Builder.newChildSaProposalBuilder() + ChildSaProposal saProposal = + new ChildSaProposal.Builder() .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_12, SaProposal.KEY_LEN_AES_128) @@ -52,22 +52,4 @@ public final class ChildSessionOptionsTest { } catch (IllegalArgumentException expected) { } } - - @Test - public void testBuildWithIkeSaProposal() throws Exception { - SaProposal saProposal = - SaProposal.Builder.newIkeSaProposalBuilder() - .addEncryptionAlgorithm( - SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_8, - SaProposal.KEY_LEN_AES_128) - .addPseudorandomFunction(SaProposal.PSEUDORANDOM_FUNCTION_AES128_XCBC) - .addDhGroup(SaProposal.DH_GROUP_1024_BIT_MODP) - .build(); - - try { - new ChildSessionOptions.Builder().addSaProposal(saProposal).build(); - fail("Expected to fail due to wrong type of SA proposal."); - } catch (IllegalArgumentException expected) { - } - } } diff --git a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java index 23331286..81280795 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java @@ -178,7 +178,7 @@ public final class ChildSessionStateMachineTest { private IntegrityTransform mChildIntegrityTransform; private DhGroupTransform mChildDhGroupTransform; - private SaProposal mMockNegotiatedProposal; + private ChildSaProposal mMockNegotiatedProposal; private Executor mSpyUserCbExecutor; private IChildSessionCallback mMockChildSessionCallback; @@ -222,7 +222,7 @@ public final class ChildSessionStateMachineTest { mMockIpSecManager = new IpSecManager(mContext, mMockIpSecService); mMockUdpEncapSocket = mock(UdpEncapsulationSocket.class); - mMockNegotiatedProposal = mock(SaProposal.class); + mMockNegotiatedProposal = mock(ChildSaProposal.class); mSpyUserCbExecutor = spy( @@ -260,8 +260,8 @@ public final class ChildSessionStateMachineTest { SaRecord.setSaRecordHelper(new SaRecordHelper()); } - private SaProposal buildSaProposal() throws Exception { - return SaProposal.Builder.newChildSaProposalBuilder() + private ChildSaProposal buildSaProposal() throws Exception { + return new ChildSaProposal.Builder() .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_CBC, SaProposal.KEY_LEN_AES_128) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) @@ -408,7 +408,7 @@ public final class ChildSessionStateMachineTest { instanceof ChildSessionStateMachine.Idle); // Validate negotiated SA proposal. - SaProposal negotiatedProposal = mChildSessionStateMachine.mSaProposal; + ChildSaProposal negotiatedProposal = mChildSessionStateMachine.mSaProposal; assertNotNull(negotiatedProposal); assertEquals( new EncryptionTransform[] {mChildEncryptionTransform}, diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java index 161da31d..32325084 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java @@ -56,7 +56,7 @@ public final class IkeSessionOptionsTest { (Inet4Address) (InetAddressUtils.parseNumericAddress("192.0.2.100")); private UdpEncapsulationSocket mUdpEncapSocket; - private SaProposal mIkeSaProposal; + private IkeSaProposal mIkeSaProposal; private IkeIdentification mLocalIdentification; private IkeIdentification mRemoteIdentification; @@ -67,7 +67,7 @@ public final class IkeSessionOptionsTest { mUdpEncapSocket = ipSecManager.openUdpEncapsulationSocket(); mIkeSaProposal = - SaProposal.Builder.newIkeSaProposalBuilder() + new IkeSaProposal.Builder() .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_8, SaProposal.KEY_LEN_AES_128) @@ -180,22 +180,4 @@ public final class IkeSessionOptionsTest { } catch (IllegalArgumentException expected) { } } - - @Test - public void testBuildWithChildSaProposal() throws Exception { - SaProposal saProposal = - SaProposal.Builder.newChildSaProposalBuilder() - .addEncryptionAlgorithm( - SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_8, - SaProposal.KEY_LEN_AES_128) - .build(); - try { - new IkeSessionOptions.Builder(REMOTE_IPV4_ADDRESS, mUdpEncapSocket) - .addSaProposal(saProposal) - .setAuthPsk(PSK) - .build(); - fail("Expected to fail due to wrong type of SA proposal."); - } catch (IllegalArgumentException expected) { - } - } } diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java index e34b12b8..e2c0c1c2 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java @@ -119,7 +119,6 @@ import com.android.ike.ikev2.message.IkePayload; import com.android.ike.ikev2.message.IkeSaPayload; import com.android.ike.ikev2.message.IkeSaPayload.DhGroupTransform; import com.android.ike.ikev2.message.IkeSaPayload.EncryptionTransform; -import com.android.ike.ikev2.message.IkeSaPayload.EsnTransform; import com.android.ike.ikev2.message.IkeSaPayload.IntegrityTransform; import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform; import com.android.ike.ikev2.message.IkeSkfPayload; @@ -707,8 +706,8 @@ public final class IkeSessionStateMachineTest { return ikeSession; } - static SaProposal buildSaProposal() throws Exception { - return SaProposal.Builder.newIkeSaProposalBuilder() + static IkeSaProposal buildSaProposal() throws Exception { + return new IkeSaProposal.Builder() .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_CBC, SaProposal.KEY_LEN_AES_128) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) @@ -736,8 +735,8 @@ public final class IkeSessionStateMachineTest { } private ChildSessionOptions buildChildSessionOptions() throws Exception { - SaProposal saProposal = - SaProposal.Builder.newChildSaProposalBuilder() + ChildSaProposal saProposal = + new ChildSaProposal.Builder() .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_CBC, SaProposal.KEY_LEN_AES_128) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) @@ -1192,7 +1191,7 @@ public final class IkeSessionStateMachineTest { verifyRetransmissionStarted(); // Validate negotiated SA proposal. - SaProposal negotiatedProposal = mIkeSessionStateMachine.mSaProposal; + IkeSaProposal negotiatedProposal = mIkeSessionStateMachine.mSaProposal; assertNotNull(negotiatedProposal); assertEquals( @@ -1202,7 +1201,6 @@ public final class IkeSessionStateMachineTest { new IntegrityTransform[] {mIkeIntegrityTransform}, negotiatedProposal.getIntegrityTransforms()); assertEquals(new PrfTransform[] {mIkePrfTransform}, negotiatedProposal.getPrfTransforms()); - assertEquals(new EsnTransform[0], negotiatedProposal.getEsnTransforms()); // Validate current IkeSaRecord. verify(mMockSaRecordHelper) diff --git a/tests/iketests/src/java/com/android/ike/ikev2/SaProposalTest.java b/tests/iketests/src/java/com/android/ike/ikev2/SaProposalTest.java index 1f841a48..da1a0f09 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/SaProposalTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/SaProposalTest.java @@ -16,13 +16,15 @@ package com.android.ike.ikev2; +import static com.android.ike.ikev2.SaProposal.KEY_LEN_AES_128; +import static com.android.ike.ikev2.SaProposal.KEY_LEN_UNUSED; + import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.ikev2.SaProposal.Builder; import com.android.ike.ikev2.message.IkePayload; import com.android.ike.ikev2.message.IkeSaPayload.DhGroupTransform; import com.android.ike.ikev2.message.IkeSaPayload.EncryptionTransform; @@ -42,7 +44,8 @@ public final class SaProposalTest { private final DhGroupTransform mDhGroup1024Transform; public SaProposalTest() { - mEncryption3DesTransform = new EncryptionTransform(SaProposal.ENCRYPTION_ALGORITHM_3DES); + mEncryption3DesTransform = + new EncryptionTransform(SaProposal.ENCRYPTION_ALGORITHM_3DES, KEY_LEN_UNUSED); mEncryptionAesGcm8Transform = new EncryptionTransform( SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_8, SaProposal.KEY_LEN_AES_128); @@ -58,9 +61,10 @@ public final class SaProposalTest { @Test public void testBuildIkeSaProposalWithNormalModeCipher() throws Exception { - Builder builder = Builder.newIkeSaProposalBuilder(); - SaProposal proposal = - builder.addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES) + IkeSaProposal proposal = + new IkeSaProposal.Builder() + .addEncryptionAlgorithm( + SaProposal.ENCRYPTION_ALGORITHM_3DES, KEY_LEN_UNUSED) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) .addPseudorandomFunction(SaProposal.PSEUDORANDOM_FUNCTION_AES128_XCBC) .addDhGroup(SaProposal.DH_GROUP_1024_BIT_MODP) @@ -81,9 +85,9 @@ public final class SaProposalTest { @Test public void testBuildIkeSaProposalWithCombinedModeCipher() throws Exception { - Builder builder = Builder.newIkeSaProposalBuilder(); - SaProposal proposal = - builder.addEncryptionAlgorithm( + IkeSaProposal proposal = + new IkeSaProposal.Builder() + .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_8, SaProposal.KEY_LEN_AES_128) .addPseudorandomFunction(SaProposal.PSEUDORANDOM_FUNCTION_AES128_XCBC) @@ -103,10 +107,10 @@ public final class SaProposalTest { @Test public void testBuildChildSaProposalWithNormalCipher() throws Exception { - Builder builder = Builder.newChildSaProposalBuilder(); - - SaProposal proposal = - builder.addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES) + ChildSaProposal proposal = + new ChildSaProposal.Builder() + .addEncryptionAlgorithm( + SaProposal.ENCRYPTION_ALGORITHM_3DES, KEY_LEN_UNUSED) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_NONE) .addDhGroup(SaProposal.DH_GROUP_1024_BIT_MODP) .build(); @@ -120,33 +124,31 @@ public final class SaProposalTest { proposal.getIntegrityTransforms()); assertArrayEquals( new DhGroupTransform[] {mDhGroup1024Transform}, proposal.getDhGroupTransforms()); - assertTrue(proposal.getPrfTransforms().length == 0); } @Test public void testGetCopyWithoutDhGroup() throws Exception { - SaProposal proposal = - Builder.newChildSaProposalBuilder() - .addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES) + ChildSaProposal proposal = + new ChildSaProposal.Builder() + .addEncryptionAlgorithm( + SaProposal.ENCRYPTION_ALGORITHM_3DES, KEY_LEN_UNUSED) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_NONE) .addDhGroup(SaProposal.DH_GROUP_1024_BIT_MODP) .build(); - SaProposal proposalWithoutDh = proposal.getCopyWithoutDhTransform(); + ChildSaProposal proposalWithoutDh = proposal.getCopyWithoutDhTransform(); assertArrayEquals( proposal.getEncryptionTransforms(), proposalWithoutDh.getEncryptionTransforms()); assertArrayEquals( proposal.getIntegrityTransforms(), proposalWithoutDh.getIntegrityTransforms()); - assertArrayEquals(proposal.getPrfTransforms(), proposalWithoutDh.getPrfTransforms()); assertTrue(proposal.getDhGroupTransforms().length == 1); assertTrue(proposalWithoutDh.getDhGroupTransforms().length == 0); } @Test public void testBuildEncryptAlgosWithNoAlgorithm() throws Exception { - Builder builder = Builder.newIkeSaProposalBuilder(); try { - builder.build(); + new IkeSaProposal.Builder().build(); fail("Expected to fail when no encryption algorithm is proposed."); } catch (IllegalArgumentException expected) { @@ -155,9 +157,8 @@ public final class SaProposalTest { @Test public void testBuildEncryptAlgosWithUnrecognizedAlgorithm() throws Exception { - Builder builder = Builder.newIkeSaProposalBuilder(); try { - builder.addEncryptionAlgorithm(-1); + new IkeSaProposal.Builder().addEncryptionAlgorithm(-1, KEY_LEN_UNUSED); fail("Expected to fail when unrecognized encryption algorithm is proposed."); } catch (IllegalArgumentException expected) { @@ -166,10 +167,11 @@ public final class SaProposalTest { @Test public void testBuildEncryptAlgosWithTwoModes() throws Exception { - Builder builder = Builder.newIkeSaProposalBuilder(); try { - builder.addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES) - .addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_12); + new IkeSaProposal.Builder() + .addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES, KEY_LEN_UNUSED) + .addEncryptionAlgorithm( + SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_12, KEY_LEN_AES_128); fail( "Expected to fail when " + "normal and combined-mode ciphers are proposed together."); @@ -180,24 +182,11 @@ public final class SaProposalTest { @Test public void testBuildIkeProposalWithoutPrf() throws Exception { - Builder builder = Builder.newIkeSaProposalBuilder(); try { - builder.addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES).build(); - fail("Expected to fail when PRF is not provided in IKE SA proposal."); - } catch (IllegalArgumentException expected) { - - } - } - - @Test - public void testBuildChildProposalWithPrf() throws Exception { - Builder builder = Builder.newChildSaProposalBuilder(); - try { - builder.addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES) - .addPseudorandomFunction(SaProposal.PSEUDORANDOM_FUNCTION_HMAC_SHA1) + new IkeSaProposal.Builder() + .addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES, KEY_LEN_UNUSED) .build(); - - fail("Expected to fail when PRF is provided in Child SA proposal."); + fail("Expected to fail when PRF is not provided in IKE SA proposal."); } catch (IllegalArgumentException expected) { } @@ -207,9 +196,10 @@ public final class SaProposalTest { // algorithm. @Test public void testBuildAeadWithIntegrityAlgo() throws Exception { - Builder builder = Builder.newChildSaProposalBuilder(); try { - builder.addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_12) + new ChildSaProposal.Builder() + .addEncryptionAlgorithm( + SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_12, KEY_LEN_AES_128) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_NONE) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) .build(); @@ -224,9 +214,9 @@ public final class SaProposalTest { // integrity algorithm. @Test public void testBuildIkeProposalNormalCipherWithoutIntegrityAlgo() throws Exception { - Builder builder = Builder.newChildSaProposalBuilder(); try { - builder.addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES) + new IkeSaProposal.Builder() + .addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES, KEY_LEN_UNUSED) .addPseudorandomFunction(SaProposal.PSEUDORANDOM_FUNCTION_HMAC_SHA1) .build(); @@ -242,9 +232,9 @@ public final class SaProposalTest { // integrity algorithm. @Test public void testBuildIkeProposalNormalCipherWithNoneValueIntegrityAlgo() throws Exception { - Builder builder = Builder.newChildSaProposalBuilder(); try { - builder.addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES) + new IkeSaProposal.Builder() + .addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES, KEY_LEN_UNUSED) .addPseudorandomFunction(SaProposal.PSEUDORANDOM_FUNCTION_HMAC_SHA1) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_NONE) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) @@ -260,9 +250,9 @@ public final class SaProposalTest { @Test public void testBuildIkeProposalWithoutDhGroup() throws Exception { - Builder builder = Builder.newIkeSaProposalBuilder(); try { - builder.addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES) + new IkeSaProposal.Builder() + .addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES, KEY_LEN_UNUSED) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) .addPseudorandomFunction(SaProposal.PSEUDORANDOM_FUNCTION_AES128_XCBC) .build(); @@ -275,9 +265,9 @@ public final class SaProposalTest { @Test public void testBuildIkeProposalWithNoneValueDhGroup() throws Exception { - Builder builder = Builder.newIkeSaProposalBuilder(); try { - builder.addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES) + new IkeSaProposal.Builder() + .addEncryptionAlgorithm(SaProposal.ENCRYPTION_ALGORITHM_3DES, KEY_LEN_UNUSED) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) .addPseudorandomFunction(SaProposal.PSEUDORANDOM_FUNCTION_AES128_XCBC) .addDhGroup(SaProposal.DH_GROUP_1024_BIT_MODP) diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSaPayloadTest.java b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSaPayloadTest.java index e389ec02..7a6bd4c7 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSaPayloadTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSaPayloadTest.java @@ -36,6 +36,8 @@ import android.net.IpSecSpiResponse; import android.util.Pair; import com.android.ike.TestUtils; +import com.android.ike.ikev2.ChildSaProposal; +import com.android.ike.ikev2.IkeSaProposal; import com.android.ike.ikev2.SaProposal; import com.android.ike.ikev2.exceptions.IkeProtocolException; import com.android.ike.ikev2.exceptions.InvalidSyntaxException; @@ -73,8 +75,8 @@ import java.util.List; public final class IkeSaPayloadTest { private static final String OUTBOUND_SA_PAYLOAD_HEADER = "22000030"; private static final String OUTBOUND_PROPOSAL_RAW_PACKET = - "0000002C010100040300000C0100000C800E0080030000080200000203000008030" - + "000020000000804000002"; + "0000002C010100040300000C0100000C800E0080030000080300000203000008040" + + "000020000000802000002"; private static final String INBOUND_PROPOSAL_RAW_PACKET = "0000002c010100040300000c0100000c800e0080030000080300000203000008040" + "000020000000802000002"; @@ -146,13 +148,13 @@ public final class IkeSaPayloadTest { private Transform[] mValidNegotiatedTransformSet; - private SaProposal mIkeSaProposalOne; - private SaProposal mIkeSaProposalTwo; - private SaProposal[] mTwoIkeSaProposalsArray; + private IkeSaProposal mIkeSaProposalOne; + private IkeSaProposal mIkeSaProposalTwo; + private IkeSaProposal[] mTwoIkeSaProposalsArray; - private SaProposal mChildSaProposalOne; - private SaProposal mChildSaProposalTwo; - private SaProposal[] mTwoChildSaProposalsArray; + private ChildSaProposal mChildSaProposalOne; + private ChildSaProposal mChildSaProposalTwo; + private ChildSaProposal[] mTwoChildSaProposalsArray; private MockIpSecTestUtils mMockIpSecTestUtils; private IpSecService mMockIpSecService; @@ -189,7 +191,7 @@ public final class IkeSaPayloadTest { }; mIkeSaProposalOne = - SaProposal.Builder.newIkeSaProposalBuilder() + new IkeSaProposal.Builder() .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_CBC, SaProposal.KEY_LEN_AES_128) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) @@ -198,7 +200,7 @@ public final class IkeSaPayloadTest { .build(); mIkeSaProposalTwo = - SaProposal.Builder.newIkeSaProposalBuilder() + new IkeSaProposal.Builder() .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_8, SaProposal.KEY_LEN_AES_128) @@ -209,21 +211,22 @@ public final class IkeSaPayloadTest { .addDhGroup(SaProposal.DH_GROUP_1024_BIT_MODP) .addDhGroup(SaProposal.DH_GROUP_2048_BIT_MODP) .build(); - mTwoIkeSaProposalsArray = new SaProposal[] {mIkeSaProposalOne, mIkeSaProposalTwo}; + mTwoIkeSaProposalsArray = new IkeSaProposal[] {mIkeSaProposalOne, mIkeSaProposalTwo}; mChildSaProposalOne = - SaProposal.Builder.newChildSaProposalBuilder() + new ChildSaProposal.Builder() .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_CBC, SaProposal.KEY_LEN_AES_128) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) .build(); mChildSaProposalTwo = - SaProposal.Builder.newChildSaProposalBuilder() + new ChildSaProposal.Builder() .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_8, SaProposal.KEY_LEN_AES_128) .build(); - mTwoChildSaProposalsArray = new SaProposal[] {mChildSaProposalOne, mChildSaProposalTwo}; + mTwoChildSaProposalsArray = + new ChildSaProposal[] {mChildSaProposalOne, mChildSaProposalTwo}; mMockIpSecTestUtils = MockIpSecTestUtils.setUpMockIpSec(); mIpSecManager = mMockIpSecTestUtils.getIpSecManager(); @@ -625,7 +628,7 @@ public final class IkeSaPayloadTest { assertEquals(IkePayload.SPI_LEN_NOT_INCLUDED, proposal.spiSize); assertEquals(IkePayload.SPI_NOT_INCLUDED, proposal.spi); assertFalse(proposal.hasUnrecognizedTransform); - assertNotNull(proposal.saProposal); + assertNotNull(proposal.getSaProposal()); } @Test @@ -734,7 +737,7 @@ public final class IkeSaPayloadTest { @Test public void testEncodeIkeSaPayload() throws Exception { IkeSaPayload saPayload = - IkeSaPayload.createInitialIkeSaPayload(new SaProposal[] {mIkeSaProposalOne}); + IkeSaPayload.createInitialIkeSaPayload(new IkeSaProposal[] {mIkeSaProposalOne}); ByteBuffer byteBuffer = ByteBuffer.allocate(saPayload.getPayloadLength()); saPayload.encodeToByteBuffer(IkePayload.PAYLOAD_TYPE_KE, byteBuffer); @@ -760,7 +763,7 @@ public final class IkeSaPayloadTest { IkeProposal reqProposal = negotiatedProposalPair.first; IkeProposal respProposal = negotiatedProposalPair.second; - assertEquals(respPayload.proposalList.get(0).saProposal, respProposal.saProposal); + assertEquals(respPayload.proposalList.get(0).getSaProposal(), respProposal.getSaProposal()); // SA Payload for IKE INIT exchange does not include IKE SPIs. assertNull(reqProposal.getIkeSpiResource()); @@ -789,7 +792,7 @@ public final class IkeSaPayloadTest { ChildProposal respProposal = negotiatedProposalPair.second; // Verify results - assertEquals(respPayload.proposalList.get(0).saProposal, respProposal.saProposal); + assertEquals(respPayload.proposalList.get(0).getSaProposal(), respProposal.getSaProposal()); int initSpi = isLocalInit ? CHILD_SPI_LOCAL_ONE : CHILD_SPI_REMOTE; int respSpi = isLocalInit ? CHILD_SPI_REMOTE : CHILD_SPI_LOCAL_ONE; |