diff options
Diffstat (limited to 'tests/iketests/src/java/com')
4 files changed, 68 insertions, 9 deletions
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 32325084..392084f7 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java @@ -74,9 +74,8 @@ public final class IkeSessionOptionsTest { .addPseudorandomFunction(SaProposal.PSEUDORANDOM_FUNCTION_AES128_XCBC) .addDhGroup(SaProposal.DH_GROUP_1024_BIT_MODP) .build(); - mLocalIdentification = new IkeIdentification.IkeIpv4AddrIdentification(LOCAL_IPV4_ADDRESS); - mRemoteIdentification = - new IkeIdentification.IkeIpv4AddrIdentification(REMOTE_IPV4_ADDRESS); + mLocalIdentification = new IkeIpv4AddrIdentification(LOCAL_IPV4_ADDRESS); + mRemoteIdentification = new IkeIpv4AddrIdentification(REMOTE_IPV4_ADDRESS); } @After 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 f25a0179..a9bff9e4 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java @@ -77,7 +77,6 @@ import com.android.ike.eap.IEapCallback; import com.android.ike.ikev2.ChildSessionStateMachine.IChildSessionSmCallback; import com.android.ike.ikev2.ChildSessionStateMachineFactory.ChildSessionFactoryHelper; import com.android.ike.ikev2.ChildSessionStateMachineFactory.IChildSessionFactoryHelper; -import com.android.ike.ikev2.IkeIdentification.IkeIpv4AddrIdentification; import com.android.ike.ikev2.IkeLocalRequestScheduler.ChildLocalRequest; import com.android.ike.ikev2.IkeLocalRequestScheduler.LocalRequest; import com.android.ike.ikev2.IkeSessionStateMachine.IkeSecurityParameterIndex; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java index be32e3fa..60e99b02 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java @@ -16,8 +16,6 @@ package com.android.ike.ikev2; -import static com.android.ike.ikev2.IkeIdentification.IkeIpv4AddrIdentification; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeIdPayloadTest.java b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeIdPayloadTest.java index cdd51d87..14d05264 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeIdPayloadTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeIdPayloadTest.java @@ -21,10 +21,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import com.android.ike.TestUtils; +import com.android.ike.ikev2.IkeFqdnIdentification; import com.android.ike.ikev2.IkeIdentification; -import com.android.ike.ikev2.IkeIdentification.IkeFqdnIdentification; -import com.android.ike.ikev2.IkeIdentification.IkeIpv4AddrIdentification; -import com.android.ike.ikev2.IkeIdentification.IkeIpv6AddrIdentification; +import com.android.ike.ikev2.IkeIpv4AddrIdentification; +import com.android.ike.ikev2.IkeIpv6AddrIdentification; +import com.android.ike.ikev2.IkeKeyIdIdentification; +import com.android.ike.ikev2.IkeRfc822AddrIdentification; import com.android.ike.ikev2.exceptions.AuthenticationFailedException; import org.junit.Test; @@ -52,6 +54,18 @@ public final class IkeIdPayloadTest { "02000000696B652E616E64726F69642E6E6574"; private static final String FQDN = "ike.android.net"; + private static final String RFC822_ADDR_ID_PAYLOAD_HEX_STRING = + "2500001e03000000616e64726f6964696b65406578616d706c652e636f6d"; + private static final String RFC822_ADDR_ID_PAYLOAD_BODY_HEX_STRING = + "03000000616e64726f6964696b65406578616d706c652e636f6d"; + private static final String RFC822_NAME = "androidike@example.com"; + + private static final String KEY_ID_PAYLOAD_HEX_STRING = + "250000170b000000616E64726F6964496B654B65794964"; + private static final String KEY_ID_PAYLOAD_BODY_HEX_STRING = + "0b000000616E64726F6964496B654B65794964"; + private static final byte[] KEY_ID = "androidIkeKeyId".getBytes(); + private static final int ID_TYPE_OFFSET = 0; @Test @@ -94,6 +108,30 @@ public final class IkeIdPayloadTest { } @Test + public void testDecodeRfc822AddrIdPayload() throws Exception { + byte[] inputPacket = TestUtils.hexStringToByteArray(RFC822_ADDR_ID_PAYLOAD_BODY_HEX_STRING); + IkeIdPayload payload = + new IkeIdPayload(false /*critical*/, inputPacket, true /*isInitiator*/); + + assertEquals(IkePayload.PAYLOAD_TYPE_ID_INITIATOR, payload.payloadType); + assertEquals(IkeIdentification.ID_TYPE_RFC822_ADDR, payload.ikeId.idType); + IkeRfc822AddrIdentification ikeId = (IkeRfc822AddrIdentification) payload.ikeId; + assertEquals(RFC822_NAME, ikeId.rfc822Name); + } + + @Test + public void testDecodeKeyIdPayload() throws Exception { + byte[] inputPacket = TestUtils.hexStringToByteArray(KEY_ID_PAYLOAD_BODY_HEX_STRING); + IkeIdPayload payload = + new IkeIdPayload(false /*critical*/, inputPacket, true /*isInitiator*/); + + assertEquals(IkePayload.PAYLOAD_TYPE_ID_INITIATOR, payload.payloadType); + assertEquals(IkeIdentification.ID_TYPE_KEY_ID, payload.ikeId.idType); + IkeKeyIdIdentification ikeId = (IkeKeyIdIdentification) payload.ikeId; + assertArrayEquals(KEY_ID, ikeId.keyId); + } + + @Test public void testDecodeUnsupportedIdType() throws Exception { byte[] inputPacket = TestUtils.hexStringToByteArray(IPV4_ADDR_ID_PAYLOAD_RESPONDER_BODY_HEX_STRING); @@ -143,4 +181,29 @@ public final class IkeIdPayloadTest { byte[] expectedBytes = TestUtils.hexStringToByteArray(FQDN_ID_PAYLOAD_HEX_STRING); assertArrayEquals(expectedBytes, inputBuffer.array()); } + + @Test + public void testConstructAndEncodeRfc822AddrIdPayload() throws Exception { + IkeIdPayload payload = + new IkeIdPayload( + true /*isInitiator*/, new IkeRfc822AddrIdentification(RFC822_NAME)); + + ByteBuffer inputBuffer = ByteBuffer.allocate(payload.getPayloadLength()); + payload.encodeToByteBuffer(IkePayload.PAYLOAD_TYPE_CERT, inputBuffer); + + byte[] expectedBytes = TestUtils.hexStringToByteArray(RFC822_ADDR_ID_PAYLOAD_HEX_STRING); + assertArrayEquals(expectedBytes, inputBuffer.array()); + } + + @Test + public void testConstructAndEncodeKeyIdPayload() throws Exception { + IkeIdPayload payload = + new IkeIdPayload(true /*isInitiator*/, new IkeKeyIdIdentification(KEY_ID)); + + ByteBuffer inputBuffer = ByteBuffer.allocate(payload.getPayloadLength()); + payload.encodeToByteBuffer(IkePayload.PAYLOAD_TYPE_CERT, inputBuffer); + + byte[] expectedBytes = TestUtils.hexStringToByteArray(KEY_ID_PAYLOAD_HEX_STRING); + assertArrayEquals(expectedBytes, inputBuffer.array()); + } } |