diff options
| author | evitayan <evitayan@google.com> | 2019-10-30 14:36:17 -0700 |
|---|---|---|
| committer | evitayan <evitayan@google.com> | 2019-11-07 14:52:32 -0800 |
| commit | e8da20d0f53fa8241d9195ae14b4434fe9b8e1e8 (patch) | |
| tree | b39c3e794945072d38b97c963c5a6f10753514e1 /tests/iketests/src | |
| parent | e27a40124c6885b385cef49f7ae3132c323e00c1 (diff) | |
| download | ike-e8da20d0f53fa8241d9195ae14b4434fe9b8e1e8.tar.gz | |
Move API and impl to separate packages
This commit
- Moves API and implementation to separate packages so that later
we can expose the API package only.
- Also moves tests accordingly
Bug: 143983419
Test: atest FrameworksIkeTests(all tests passed)
Change-Id: I53cf15caefb09aabaeefd0167d8daeb23e5e571f
Diffstat (limited to 'tests/iketests/src')
| -rw-r--r-- | tests/iketests/src/java/android/net/eap/EapSessionConfigTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/EapSessionConfigTest.java) | 22 | ||||
| -rw-r--r-- | tests/iketests/src/java/android/net/ipsec/ike/ChildSessionConfigurationTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/ChildSessionConfigurationTest.java) | 12 | ||||
| -rw-r--r-- | tests/iketests/src/java/android/net/ipsec/ike/ChildSessionOptionsTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/ChildSessionOptionsTest.java) | 2 | ||||
| -rw-r--r-- | tests/iketests/src/java/android/net/ipsec/ike/IkeSessionOptionsTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java) | 16 | ||||
| -rw-r--r-- | tests/iketests/src/java/android/net/ipsec/ike/IkeSessionTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java) | 6 | ||||
| -rw-r--r-- | tests/iketests/src/java/android/net/ipsec/ike/IkeTrafficSelectorTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/IkeTrafficSelectorTest.java) | 6 | ||||
| -rw-r--r-- | tests/iketests/src/java/android/net/ipsec/ike/SaProposalTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/SaProposalTest.java) | 18 | ||||
| -rw-r--r-- | tests/iketests/src/java/android/net/ipsec/ike/TunnelModeChildSessionOptionsTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/TunnelModeChildSessionOptionsTest.java) | 20 | ||||
| -rw-r--r-- | tests/iketests/src/java/android/net/ipsec/ike/exceptions/IkeProtocolExceptionTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/exceptions/IkeProtocolExceptionTest.java) | 10 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/TestUtils.java (renamed from tests/iketests/src/java/com/android/ike/TestUtils.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/EapAkaPrimeTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/EapAkaPrimeTest.java) | 9 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/EapAkaTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/EapAkaTest.java) | 9 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/EapAuthenticatorTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/EapAuthenticatorTest.java) | 26 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/EapErrorTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/EapErrorTest.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/EapMethodEndToEndTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/EapMethodEndToEndTest.java) | 11 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/EapMsChapV2Test.java (renamed from tests/iketests/src/java/com/android/ike/eap/EapMsChapV2Test.java) | 10 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/EapResponseTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/EapResponseTest.java) | 14 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/EapSimTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/EapSimTest.java) | 11 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/EapSuccessTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/EapSuccessTest.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/EapTestUtils.java (renamed from tests/iketests/src/java/com/android/ike/eap/EapTestUtils.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/crypto/Fips186_2PrfTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/crypto/Fips186_2PrfTest.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/crypto/HmacSha256ByteSignerTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/crypto/HmacSha256ByteSignerTest.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/crypto/ParityBitUtilTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/crypto/ParityBitUtilTest.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/EapDataTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/EapDataTest.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/EapMessageTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/EapMessageTest.java) | 50 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/EapTestMessageDefinitions.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/EapTestMessageDefinitions.java) | 18 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2ChallengeRequestTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2ChallengeRequestTest.java) | 32 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2ChallengeResponseTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2ChallengeResponseTest.java) | 22 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2FailureRequestTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2FailureRequestTest.java) | 44 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2FailureResponseTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2FailureResponseTest.java) | 8 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2PacketDefinitions.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2PacketDefinitions.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2SuccessRequestTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2SuccessRequestTest.java) | 42 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2SuccessResponseTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2SuccessResponseTest.java) | 8 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2TypeDataTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2TypeDataTest.java) | 34 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapAkaPrimeTypeDataTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/EapAkaPrimeTypeDataTest.java) | 42 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapAkaTypeDataTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/EapAkaTypeDataTest.java) | 48 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapSimAkaAttributeFactoryTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/EapSimAkaAttributeFactoryTest.java) | 14 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapSimTypeDataTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/EapSimTypeDataTest.java) | 26 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtAutnTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtAutnTest.java) | 18 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtAutsTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtAutsTest.java) | 18 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtBiddingTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtBiddingTest.java) | 18 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtClientErrorCodeTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtClientErrorCodeTest.java) | 18 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtCounterTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtCounterTest.java) | 26 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtIdReqTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtIdReqTest.java) | 34 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtIdentityTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtIdentityTest.java) | 16 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtKdfInputTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtKdfInputTest.java) | 16 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtKdfTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtKdfTest.java) | 18 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtMacTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtMacTest.java) | 20 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtNonceMtTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtNonceMtTest.java) | 18 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtNonceSTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtNonceSTest.java) | 20 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtNotificationTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtNotificationTest.java) | 24 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtPaddingTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtPaddingTest.java) | 16 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtRandAkaTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtRandAkaTest.java) | 18 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtRandSimTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtRandSimTest.java) | 26 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtResTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtResTest.java) | 22 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtSelectedVersionTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtSelectedVersionTest.java) | 16 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtVersionListTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtVersionListTest.java) | 20 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/EapSimAkaAttributeTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/EapSimAkaAttributeTest.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/EapTestAttributeDefinitions.java (renamed from tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/EapTestAttributeDefinitions.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/CreatedStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/CreatedStateTest.java) | 18 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaChallengeStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaChallengeStateTest.java) | 90 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaCreatedStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaCreatedStateTest.java) | 38 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaIdentityStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaIdentityStateTest.java) | 40 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaMethodStateMachineTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaMethodStateMachineTest.java) | 46 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeChallengeStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeChallengeStateTest.java) | 65 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeCreatedStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeCreatedStateTest.java) | 24 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeIdentityStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeIdentityStateTest.java) | 32 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeMethodStateMachineTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeMethodStateMachineTest.java) | 30 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeStateTest.java) | 42 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeTest.java) | 8 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaStateTest.java) | 44 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2AwaitingEapFailureStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2AwaitingEapFailureStateTest.java) | 2 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2AwaitingEapSuccessStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2AwaitingEapSuccessStateTest.java) | 18 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2ChallengeStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2ChallengeStateTest.java) | 40 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2CreatedStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2CreatedStateTest.java) | 28 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2MethodStateMachineTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2MethodStateMachineTest.java) | 43 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2StateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2StateTest.java) | 45 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2ValidateAuthenticatorStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2ValidateAuthenticatorStateTest.java) | 66 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimAkaMethodStateMachineTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimAkaMethodStateMachineTest.java) | 136 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimChallengeStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimChallengeStateTest.java) | 92 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimCreatedStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimCreatedStateTest.java) | 43 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimMethodStateMachineTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimMethodStateMachineTest.java) | 46 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimStartStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimStartStateTest.java) | 82 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimStateTest.java) | 44 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapStateMachineTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapStateMachineTest.java) | 20 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/EapStateTest.java) | 32 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/IdentityStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/IdentityStateTest.java) | 24 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/eap/statemachine/MethodStateTest.java (renamed from tests/iketests/src/java/com/android/ike/eap/statemachine/MethodStateTest.java) | 57 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/ChildSessionStateMachineTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java) | 120 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeLocalRequestSchedulerTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/IkeLocalRequestSchedulerTest.java) | 8 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionStateMachineTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java) | 175 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSocketTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/IkeSocketTest.java) | 8 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/SaRecordTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/SaRecordTest.java) | 43 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeCombinedModeCipherTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeCombinedModeCipherTest.java) | 10 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeMacIntegrityTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeMacIntegrityTest.java) | 10 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeMacPrfTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeMacPrfTest.java) | 11 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeNormalModeCipherTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeNormalModeCipherTest.java) | 10 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeAuthDigitalSignPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeAuthDigitalSignPayloadTest.java) | 17 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeAuthPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeAuthPayloadTest.java) | 13 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeAuthPskPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeAuthPskPayloadTest.java) | 13 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeCertPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeCertPayloadTest.java) | 6 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeCertX509CertPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeCertX509CertPayloadTest.java) | 6 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeConfigPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeConfigPayloadTest.java) | 54 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeDeletePayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeDeletePayloadTest.java) | 14 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeEapPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeEapPayloadTest.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeEncryptedPayloadBodyTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeEncryptedPayloadBodyTest.java) | 19 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeHeaderTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeHeaderTest.java) | 8 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeIdPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeIdPayloadTest.java) | 19 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeKePayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeKePayloadTest.java) | 13 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeMessageTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeMessageTest.java) | 45 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeNoncePayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeNoncePayloadTest.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeNotifyPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeNotifyPayloadTest.java) | 23 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSaPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeSaPayloadTest.java) | 48 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSkPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeSkPayloadTest.java) | 15 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSkfPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeSkfPayloadTest.java) | 19 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeTestUtils.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeTestUtils.java) | 12 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeTsPayloadTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/message/IkeTsPayloadTest.java) | 7 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/testutils/CertUtils.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/testutils/CertUtils.java) | 4 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/testutils/MockIpSecTestUtils.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/testutils/MockIpSecTestUtils.java) | 2 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/ipsec/ike/utils/RetransmitterTest.java (renamed from tests/iketests/src/java/com/android/ike/ikev2/utils/RetransmitterTest.java) | 6 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/utils/BigIntegerUtilsTest.java (renamed from tests/iketests/src/java/com/android/ike/utils/BigIntegerUtilsTest.java) | 2 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/utils/LogTest.java (renamed from tests/iketests/src/java/com/android/ike/utils/LogTest.java) | 2 | ||||
| -rw-r--r-- | tests/iketests/src/java/com/android/internal/net/utils/SimpleStateMachineTest.java (renamed from tests/iketests/src/java/com/android/ike/utils/SimpleStateMachineTest.java) | 4 |
123 files changed, 1566 insertions, 1519 deletions
diff --git a/tests/iketests/src/java/com/android/ike/eap/EapSessionConfigTest.java b/tests/iketests/src/java/android/net/eap/EapSessionConfigTest.java index ffed33fb..eed32e3e 100644 --- a/tests/iketests/src/java/com/android/ike/eap/EapSessionConfigTest.java +++ b/tests/iketests/src/java/android/net/eap/EapSessionConfigTest.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package com.android.ike.eap; +package android.net.eap; +import static android.net.eap.EapSessionConfig.DEFAULT_IDENTITY; import static android.telephony.TelephonyManager.APPTYPE_USIM; -import static com.android.ike.eap.EapSessionConfig.DEFAULT_IDENTITY; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA_PRIME; -import static com.android.ike.eap.message.EapData.EAP_TYPE_MSCHAP_V2; -import static com.android.ike.eap.message.EapData.EAP_TYPE_SIM; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA_PRIME; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_MSCHAP_V2; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_SIM; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.EapSessionConfig.EapAkaConfig; -import com.android.ike.eap.EapSessionConfig.EapAkaPrimeConfig; -import com.android.ike.eap.EapSessionConfig.EapMethodConfig; -import com.android.ike.eap.EapSessionConfig.EapMsChapV2Config; -import com.android.ike.eap.EapSessionConfig.EapSimConfig; +import android.net.eap.EapSessionConfig.EapAkaConfig; +import android.net.eap.EapSessionConfig.EapAkaPrimeConfig; +import android.net.eap.EapSessionConfig.EapMethodConfig; +import android.net.eap.EapSessionConfig.EapMsChapV2Config; +import android.net.eap.EapSessionConfig.EapSimConfig; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionConfigurationTest.java b/tests/iketests/src/java/android/net/ipsec/ike/ChildSessionConfigurationTest.java index bd8da2c8..08d89942 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionConfigurationTest.java +++ b/tests/iketests/src/java/android/net/ipsec/ike/ChildSessionConfigurationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2; +package android.net.ipsec.ike; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -22,11 +22,11 @@ import static org.mockito.Mockito.mock; import android.net.LinkAddress; -import com.android.ike.ikev2.message.IkeConfigPayload; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttribute; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv4Address; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv4Netmask; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv6Address; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttribute; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv4Address; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv4Netmask; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv6Address; import libcore.net.InetAddressUtils; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionOptionsTest.java b/tests/iketests/src/java/android/net/ipsec/ike/ChildSessionOptionsTest.java index 5f8a4fc6..242957d6 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionOptionsTest.java +++ b/tests/iketests/src/java/android/net/ipsec/ike/ChildSessionOptionsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2; +package android.net.ipsec.ike; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java b/tests/iketests/src/java/android/net/ipsec/ike/IkeSessionOptionsTest.java index 88ff2f1d..fa077d17 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java +++ b/tests/iketests/src/java/android/net/ipsec/ike/IkeSessionOptionsTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.ike.ikev2; +package android.net.ipsec.ike; -import static com.android.ike.ikev2.IkeSessionOptions.IkeAuthConfig; -import static com.android.ike.ikev2.IkeSessionOptions.IkeAuthDigitalSignLocalConfig; -import static com.android.ike.ikev2.IkeSessionOptions.IkeAuthDigitalSignRemoteConfig; -import static com.android.ike.ikev2.IkeSessionOptions.IkeAuthEapConfig; -import static com.android.ike.ikev2.IkeSessionOptions.IkeAuthPskConfig; +import static android.net.ipsec.ike.IkeSessionOptions.IkeAuthConfig; +import static android.net.ipsec.ike.IkeSessionOptions.IkeAuthDigitalSignLocalConfig; +import static android.net.ipsec.ike.IkeSessionOptions.IkeAuthDigitalSignRemoteConfig; +import static android.net.ipsec.ike.IkeSessionOptions.IkeAuthEapConfig; +import static android.net.ipsec.ike.IkeSessionOptions.IkeAuthPskConfig; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -32,11 +32,11 @@ import static org.mockito.Mockito.mock; import android.content.Context; import android.net.IpSecManager; import android.net.IpSecManager.UdpEncapsulationSocket; +import android.net.eap.EapSessionConfig; import androidx.test.InstrumentationRegistry; -import com.android.ike.TestUtils; -import com.android.ike.eap.EapSessionConfig; +import com.android.internal.net.TestUtils; import libcore.net.InetAddressUtils; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java b/tests/iketests/src/java/android/net/ipsec/ike/IkeSessionTest.java index 28a13110..8bf1281d 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java +++ b/tests/iketests/src/java/android/net/ipsec/ike/IkeSessionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2; +package android.net.ipsec.ike; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,7 +27,9 @@ import android.os.Looper; import android.os.test.TestLooper; import android.util.Log; -import com.android.ike.ikev2.testutils.MockIpSecTestUtils; +import com.android.internal.net.ipsec.ike.IkeSessionStateMachine; +import com.android.internal.net.ipsec.ike.IkeSessionStateMachineTest; +import com.android.internal.net.ipsec.ike.testutils.MockIpSecTestUtils; import libcore.net.InetAddressUtils; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeTrafficSelectorTest.java b/tests/iketests/src/java/android/net/ipsec/ike/IkeTrafficSelectorTest.java index d8bde92e..65cf0566 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeTrafficSelectorTest.java +++ b/tests/iketests/src/java/android/net/ipsec/ike/IkeTrafficSelectorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2; +package android.net.ipsec.ike; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -23,8 +23,8 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.exceptions.InvalidSyntaxException; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.exceptions.InvalidSyntaxException; import libcore.net.InetAddressUtils; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/SaProposalTest.java b/tests/iketests/src/java/android/net/ipsec/ike/SaProposalTest.java index da1a0f09..d4efb0c3 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/SaProposalTest.java +++ b/tests/iketests/src/java/android/net/ipsec/ike/SaProposalTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.ike.ikev2; +package android.net.ipsec.ike; -import static com.android.ike.ikev2.SaProposal.KEY_LEN_AES_128; -import static com.android.ike.ikev2.SaProposal.KEY_LEN_UNUSED; +import static android.net.ipsec.ike.SaProposal.KEY_LEN_AES_128; +import static android.net.ipsec.ike.SaProposal.KEY_LEN_UNUSED; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -25,12 +25,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.ikev2.message.IkePayload; -import com.android.ike.ikev2.message.IkeSaPayload.DhGroupTransform; -import com.android.ike.ikev2.message.IkeSaPayload.EncryptionTransform; -import com.android.ike.ikev2.message.IkeSaPayload.IntegrityTransform; -import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform; -import com.android.ike.ikev2.message.IkeSaPayload.Transform; +import com.android.internal.net.ipsec.ike.message.IkePayload; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.DhGroupTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.EncryptionTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.IntegrityTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.PrfTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.Transform; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/TunnelModeChildSessionOptionsTest.java b/tests/iketests/src/java/android/net/ipsec/ike/TunnelModeChildSessionOptionsTest.java index e14e6e86..b0f81dc2 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/TunnelModeChildSessionOptionsTest.java +++ b/tests/iketests/src/java/android/net/ipsec/ike/TunnelModeChildSessionOptionsTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.android.ike.ikev2; +package android.net.ipsec.ike; import static android.system.OsConstants.AF_INET; import static android.system.OsConstants.AF_INET6; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_ADDRESS; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_DHCP; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_DNS; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_NETMASK; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_SUBNET; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_ADDRESS; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_DNS; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_SUBNET; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_ADDRESS; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_DHCP; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_DNS; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_NETMASK; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_SUBNET; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_ADDRESS; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_DNS; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_SUBNET; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -36,7 +36,7 @@ import static org.junit.Assert.fail; import android.util.SparseArray; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttribute; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttribute; import libcore.net.InetAddressUtils; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/exceptions/IkeProtocolExceptionTest.java b/tests/iketests/src/java/android/net/ipsec/ike/exceptions/IkeProtocolExceptionTest.java index 69f03be2..8c3b16da 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/exceptions/IkeProtocolExceptionTest.java +++ b/tests/iketests/src/java/android/net/ipsec/ike/exceptions/IkeProtocolExceptionTest.java @@ -14,15 +14,17 @@ * limitations under the License. */ -package com.android.ike.ikev2.exceptions; +package android.net.ipsec.ike.exceptions; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_NO_PROPOSAL_CHOSEN; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_UNSUPPORTED_CRITICAL_PAYLOAD; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_NO_PROPOSAL_CHOSEN; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_UNSUPPORTED_CRITICAL_PAYLOAD; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import com.android.ike.ikev2.message.IkeNotifyPayload; +import com.android.internal.net.ipsec.ike.exceptions.NoValidProposalChosenException; +import com.android.internal.net.ipsec.ike.exceptions.UnsupportedCriticalPayloadException; +import com.android.internal.net.ipsec.ike.message.IkeNotifyPayload; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/TestUtils.java b/tests/iketests/src/java/com/android/internal/net/TestUtils.java index f11972ff..6dd5ce5e 100644 --- a/tests/iketests/src/java/com/android/ike/TestUtils.java +++ b/tests/iketests/src/java/com/android/internal/net/TestUtils.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.ike; +package com.android.internal.net; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; -import com.android.ike.utils.Log; +import com.android.internal.net.utils.Log; import java.nio.ByteBuffer; diff --git a/tests/iketests/src/java/com/android/ike/eap/EapAkaPrimeTest.java b/tests/iketests/src/java/com/android/internal/net/eap/EapAkaPrimeTest.java index d8f43295..0872b67f 100644 --- a/tests/iketests/src/java/com/android/ike/eap/EapAkaPrimeTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/EapAkaPrimeTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.ike.eap; +package com.android.internal.net.eap; import static android.telephony.TelephonyManager.APPTYPE_USIM; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -28,9 +28,10 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import android.content.Context; +import android.net.eap.EapSessionConfig; import android.telephony.TelephonyManager; -import com.android.ike.eap.statemachine.EapStateMachine; +import com.android.internal.net.eap.statemachine.EapStateMachine; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/EapAkaTest.java b/tests/iketests/src/java/com/android/internal/net/eap/EapAkaTest.java index b1744e17..e982a85d 100644 --- a/tests/iketests/src/java/com/android/ike/eap/EapAkaTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/EapAkaTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.ike.eap; +package com.android.internal.net.eap; import static android.telephony.TelephonyManager.APPTYPE_USIM; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -28,9 +28,10 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import android.content.Context; +import android.net.eap.EapSessionConfig; import android.telephony.TelephonyManager; -import com.android.ike.eap.statemachine.EapStateMachine; +import com.android.internal.net.eap.statemachine.EapStateMachine; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/EapAuthenticatorTest.java b/tests/iketests/src/java/com/android/internal/net/eap/EapAuthenticatorTest.java index 11d46615..4c868a03 100644 --- a/tests/iketests/src/java/com/android/ike/eap/EapAuthenticatorTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/EapAuthenticatorTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.ike.eap; +package com.android.internal.net.eap; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_FAILURE_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_RESPONSE_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SUCCESS_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.REQUEST_UNSUPPORTED_TYPE_PACKET; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_FAILURE_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_RESPONSE_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SUCCESS_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.REQUEST_UNSUPPORTED_TYPE_PACKET; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse; @@ -35,12 +35,12 @@ import static org.mockito.Mockito.when; import android.os.Looper; import android.os.test.TestLooper; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapFailure; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.EapResult.EapSuccess; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.statemachine.EapStateMachine; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapFailure; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.EapResult.EapSuccess; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.statemachine.EapStateMachine; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/EapErrorTest.java b/tests/iketests/src/java/com/android/internal/net/eap/EapErrorTest.java index f2209eca..ce497635 100644 --- a/tests/iketests/src/java/com/android/ike/eap/EapErrorTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/EapErrorTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.ike.eap; +package com.android.internal.net.eap; import static org.junit.Assert.assertEquals; -import com.android.ike.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapError; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/EapMethodEndToEndTest.java b/tests/iketests/src/java/com/android/internal/net/eap/EapMethodEndToEndTest.java index aed73c25..412a4cf1 100644 --- a/tests/iketests/src/java/com/android/ike/eap/EapMethodEndToEndTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/EapMethodEndToEndTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.ike.eap; +package com.android.internal.net.eap; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_FAILURE_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SUCCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_FAILURE_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SUCCESS; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -28,6 +28,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import android.content.Context; +import android.net.eap.EapSessionConfig; import android.os.test.TestLooper; import org.junit.Before; diff --git a/tests/iketests/src/java/com/android/ike/eap/EapMsChapV2Test.java b/tests/iketests/src/java/com/android/internal/net/eap/EapMsChapV2Test.java index d63b59f2..01264f9d 100644 --- a/tests/iketests/src/java/com/android/ike/eap/EapMsChapV2Test.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/EapMsChapV2Test.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.ike.eap; +package com.android.internal.net.eap; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_AKA_IDENTITY_PACKET; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_AKA_IDENTITY_PACKET; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -25,7 +25,9 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import com.android.ike.eap.statemachine.EapStateMachine; +import android.net.eap.EapSessionConfig; + +import com.android.internal.net.eap.statemachine.EapStateMachine; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/EapResponseTest.java b/tests/iketests/src/java/com/android/internal/net/eap/EapResponseTest.java index 77aed415..0c6dd52d 100644 --- a/tests/iketests/src/java/com/android/ike/eap/EapResponseTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/EapResponseTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.android.ike.eap; +package com.android.internal.net.eap; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NAK_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SUCCESS_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NAK_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SUCCESS_PACKET; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.exceptions.InvalidEapResponseException; -import com.android.ike.eap.message.EapMessage; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.exceptions.InvalidEapResponseException; +import com.android.internal.net.eap.message.EapMessage; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/EapSimTest.java b/tests/iketests/src/java/com/android/internal/net/eap/EapSimTest.java index b6f41659..8b11d278 100644 --- a/tests/iketests/src/java/com/android/ike/eap/EapSimTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/EapSimTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.ike.eap; +package com.android.internal.net.eap; import static android.telephony.TelephonyManager.APPTYPE_USIM; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_AKA_IDENTITY_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NAK_PACKET; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_AKA_IDENTITY_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NAK_PACKET; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -31,9 +31,10 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import android.content.Context; +import android.net.eap.EapSessionConfig; import android.telephony.TelephonyManager; -import com.android.ike.eap.statemachine.EapStateMachine; +import com.android.internal.net.eap.statemachine.EapStateMachine; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/EapSuccessTest.java b/tests/iketests/src/java/com/android/internal/net/eap/EapSuccessTest.java index 724101fd..d7410540 100644 --- a/tests/iketests/src/java/com/android/ike/eap/EapSuccessTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/EapSuccessTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.ike.eap; +package com.android.internal.net.eap; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.fail; -import com.android.ike.eap.EapResult.EapSuccess; +import com.android.internal.net.eap.EapResult.EapSuccess; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/EapTestUtils.java b/tests/iketests/src/java/com/android/internal/net/eap/EapTestUtils.java index aa374552..de058d15 100644 --- a/tests/iketests/src/java/com/android/ike/eap/EapTestUtils.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/EapTestUtils.java @@ -14,10 +14,12 @@ * limitations under the License. */ -package com.android.ike.eap; +package com.android.internal.net.eap; import static android.telephony.TelephonyManager.APPTYPE_USIM; +import android.net.eap.EapSessionConfig; + import java.util.HashMap; /** diff --git a/tests/iketests/src/java/com/android/ike/eap/crypto/Fips186_2PrfTest.java b/tests/iketests/src/java/com/android/internal/net/eap/crypto/Fips186_2PrfTest.java index 7bded7b2..978f070f 100644 --- a/tests/iketests/src/java/com/android/ike/eap/crypto/Fips186_2PrfTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/crypto/Fips186_2PrfTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.ike.eap.crypto; +package com.android.internal.net.eap.crypto; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.fail; -import com.android.ike.TestUtils; +import com.android.internal.net.TestUtils; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/crypto/HmacSha256ByteSignerTest.java b/tests/iketests/src/java/com/android/internal/net/eap/crypto/HmacSha256ByteSignerTest.java index d178a45a..355c1db1 100644 --- a/tests/iketests/src/java/com/android/ike/eap/crypto/HmacSha256ByteSignerTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/crypto/HmacSha256ByteSignerTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.ike.eap.crypto; +package com.android.internal.net.eap.crypto; -import static com.android.ike.TestUtils.hexStringToByteArray; +import static com.android.internal.net.TestUtils.hexStringToByteArray; import static org.junit.Assert.assertArrayEquals; diff --git a/tests/iketests/src/java/com/android/ike/eap/crypto/ParityBitUtilTest.java b/tests/iketests/src/java/com/android/internal/net/eap/crypto/ParityBitUtilTest.java index ae31caf0..7ba024e5 100644 --- a/tests/iketests/src/java/com/android/ike/eap/crypto/ParityBitUtilTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/crypto/ParityBitUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.ike.eap.crypto; +package com.android.internal.net.eap.crypto; -import static com.android.ike.TestUtils.hexStringToByteArray; +import static com.android.internal.net.TestUtils.hexStringToByteArray; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/EapDataTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/EapDataTest.java index 49de5364..9d4cc7ca 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/EapDataTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/EapDataTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.ike.eap.message; +package com.android.internal.net.eap.message; -import static com.android.ike.eap.message.EapData.EAP_TYPE_SIM; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_SIM; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/EapMessageTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/EapMessageTest.java index 88d2b6fc..813a30f7 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/EapMessageTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/EapMessageTest.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package com.android.ike.eap.message; - -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapData.EAP_NAK; -import static com.android.ike.eap.message.EapData.EAP_TYPE_SIM; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_RESPONSE; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_SUCCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_TYPE_DATA; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NAK_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SUCCESS_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.INCOMPLETE_HEADER_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.INVALID_CODE_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.LONG_SUCCESS_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.REQUEST_MISSING_TYPE_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.REQUEST_UNSUPPORTED_TYPE_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.SHORT_PACKET; +package com.android.internal.net.eap.message; + +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapData.EAP_NAK; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_SIM; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_RESPONSE; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_SUCCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_TYPE_DATA; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NAK_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SUCCESS_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.INCOMPLETE_HEADER_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.INVALID_CODE_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.LONG_SUCCESS_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.REQUEST_MISSING_TYPE_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.REQUEST_UNSUPPORTED_TYPE_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.SHORT_PACKET; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -41,11 +41,11 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.exceptions.EapInvalidPacketLengthException; -import com.android.ike.eap.exceptions.InvalidEapCodeException; -import com.android.ike.eap.exceptions.UnsupportedEapTypeException; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.exceptions.EapInvalidPacketLengthException; +import com.android.internal.net.eap.exceptions.InvalidEapCodeException; +import com.android.internal.net.eap.exceptions.UnsupportedEapTypeException; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/EapTestMessageDefinitions.java b/tests/iketests/src/java/com/android/internal/net/eap/message/EapTestMessageDefinitions.java index 30ca917f..20517583 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/EapTestMessageDefinitions.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/EapTestMessageDefinitions.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.ike.eap.message; - -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_VERSION_LIST_DATA; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.IDENTITY_STRING; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT_STRING; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_2; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RES; +package com.android.internal.net.eap.message; + +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_VERSION_LIST_DATA; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.IDENTITY_STRING; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT_STRING; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_2; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RES; /** * EapTestMessageDefinitions provides byte[] encodings of commonly used EAP Messages. diff --git a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2ChallengeRequestTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2ChallengeRequestTest.java index a5aff231..45a86735 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2ChallengeRequestTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2ChallengeRequestTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.android.ike.eap.message.mschapv2; - -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_REQUEST_LONG_MS_LENGTH; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_REQUEST_SHORT_CHALLENGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_REQUEST_SHORT_MS_LENGTH; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_REQUEST_WRONG_OP_CODE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_CHALLENGE_REQUEST; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ID_INT; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SERVER_NAME_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_CHALLENGE; +package com.android.internal.net.eap.message.mschapv2; + +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_REQUEST_LONG_MS_LENGTH; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_REQUEST_SHORT_CHALLENGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_REQUEST_SHORT_MS_LENGTH; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_REQUEST_WRONG_OP_CODE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_CHALLENGE_REQUEST; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ID_INT; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SERVER_NAME_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_CHALLENGE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -32,11 +32,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.exceptions.mschapv2.EapMsChapV2ParsingException; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeRequest; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.exceptions.mschapv2.EapMsChapV2ParsingException; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeRequest; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2ChallengeResponseTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2ChallengeResponseTest.java index f43dd4d8..3e243a98 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2ChallengeResponseTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2ChallengeResponseTest.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package com.android.ike.eap.message.mschapv2; +package com.android.internal.net.eap.message.mschapv2; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_CHALLENGE_RESPONSE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ID_INT; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.NT_RESPONSE_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.PEER_CHALLENGE_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.PEER_NAME_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SHORT_CHALLENGE_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SHORT_NT_RESPONSE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_RESPONSE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_CHALLENGE_RESPONSE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ID_INT; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.NT_RESPONSE_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.PEER_CHALLENGE_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.PEER_NAME_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SHORT_CHALLENGE_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SHORT_NT_RESPONSE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_RESPONSE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.mschapv2.EapMsChapV2ParsingException; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeResponse; +import com.android.internal.net.eap.exceptions.mschapv2.EapMsChapV2ParsingException; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeResponse; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2FailureRequestTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2FailureRequestTest.java index 67790760..ead8022a 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2FailureRequestTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2FailureRequestTest.java @@ -14,34 +14,34 @@ * limitations under the License. */ -package com.android.ike.eap.message.mschapv2; - -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_FAILURE_REQUEST; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_FAILURE_REQUEST_MISSING_MESSAGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_FAILURE_REQUEST_MISSING_MESSAGE_WITH_SPACE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ERROR_CODE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.FAILURE_REQUEST_EXTRA_ATTRIBUTE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.FAILURE_REQUEST_INVALID_CHALLENGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.FAILURE_REQUEST_INVALID_ERROR_CODE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.FAILURE_REQUEST_INVALID_PASSWORD_CHANGE_PROTOCOL; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.FAILURE_REQUEST_SHORT_CHALLENGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ID_INT; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE_MISSING_TEXT; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.PASSWORD_CHANGE_PROTOCOL; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.RETRY_BIT; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_FAILURE; +package com.android.internal.net.eap.message.mschapv2; + +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_FAILURE_REQUEST; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_FAILURE_REQUEST_MISSING_MESSAGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_FAILURE_REQUEST_MISSING_MESSAGE_WITH_SPACE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ERROR_CODE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.FAILURE_REQUEST_EXTRA_ATTRIBUTE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.FAILURE_REQUEST_INVALID_CHALLENGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.FAILURE_REQUEST_INVALID_ERROR_CODE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.FAILURE_REQUEST_INVALID_PASSWORD_CHANGE_PROTOCOL; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.FAILURE_REQUEST_SHORT_CHALLENGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ID_INT; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE_MISSING_TEXT; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.PASSWORD_CHANGE_PROTOCOL; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.RETRY_BIT; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_FAILURE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.mschapv2.EapMsChapV2ParsingException; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2FailureRequest; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; +import com.android.internal.net.eap.exceptions.mschapv2.EapMsChapV2ParsingException; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2FailureRequest; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2FailureResponseTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2FailureResponseTest.java index 05d71ca7..261ddb28 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2FailureResponseTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2FailureResponseTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.ike.eap.message.mschapv2; +package com.android.internal.net.eap.message.mschapv2; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_FAILURE_RESPONSE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_FAILURE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_FAILURE_RESPONSE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_FAILURE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2FailureResponse; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2FailureResponse; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2PacketDefinitions.java b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2PacketDefinitions.java index 687ed926..e70c2a2f 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2PacketDefinitions.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2PacketDefinitions.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.ike.eap.message.mschapv2; +package com.android.internal.net.eap.message.mschapv2; -import static com.android.ike.TestUtils.hexStringToByteArray; +import static com.android.internal.net.TestUtils.hexStringToByteArray; public class EapMsChapV2PacketDefinitions { public static final String ID = "1F"; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2SuccessRequestTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2SuccessRequestTest.java index 72593ada..1e0909ed 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2SuccessRequestTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2SuccessRequestTest.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.android.ike.eap.message.mschapv2; - -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.AUTH_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_SUCCESS_REQUEST; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_SUCCESS_REQUEST_EMPTY_MESSAGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_SUCCESS_REQUEST_MISSING_MESSAGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_SUCCESS_REQUEST_MISSING_MESSAGE_WITH_SPACE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ID_INT; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE_MISSING_TEXT; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_EXTRA_ATTRIBUTE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_INVALID_AUTH_STRING; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_SHORT_AUTH_STRING; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_WRONG_OP_CODE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_WRONG_PREFIX; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_SUCCESS; +package com.android.internal.net.eap.message.mschapv2; + +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.AUTH_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_SUCCESS_REQUEST; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_SUCCESS_REQUEST_EMPTY_MESSAGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_SUCCESS_REQUEST_MISSING_MESSAGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_SUCCESS_REQUEST_MISSING_MESSAGE_WITH_SPACE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ID_INT; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE_MISSING_TEXT; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_EXTRA_ATTRIBUTE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_INVALID_AUTH_STRING; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_SHORT_AUTH_STRING; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_WRONG_OP_CODE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_WRONG_PREFIX; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_SUCCESS; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -37,11 +37,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.exceptions.mschapv2.EapMsChapV2ParsingException; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2SuccessRequest; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.exceptions.mschapv2.EapMsChapV2ParsingException; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2SuccessRequest; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2SuccessResponseTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2SuccessResponseTest.java index 3e6a9c5f..524b3ecf 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2SuccessResponseTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2SuccessResponseTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.ike.eap.message.mschapv2; +package com.android.internal.net.eap.message.mschapv2; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_SUCCESS_RESPONSE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_SUCCESS; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EAP_MSCHAP_V2_SUCCESS_RESPONSE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_SUCCESS; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2SuccessResponse; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2SuccessResponse; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2TypeDataTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2TypeDataTest.java index a3376031..45f1c641 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/mschapv2/EapMsChapV2TypeDataTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/mschapv2/EapMsChapV2TypeDataTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.android.ike.eap.message.mschapv2; - -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.AUTH_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.AUTH_STRING; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EXTRA_M_MESSAGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE_MISSING_TEXT; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_DUPLICATE_KEY; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_EXTRA_M; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_INVALID_FORMAT; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_MISSING_M; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_CHALLENGE; +package com.android.internal.net.eap.message.mschapv2; + +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.AUTH_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.AUTH_STRING; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.EXTRA_M_MESSAGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE_MISSING_TEXT; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_DUPLICATE_KEY; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_EXTRA_M; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_INVALID_FORMAT; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SUCCESS_REQUEST_MISSING_M; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_CHALLENGE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -34,10 +34,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.exceptions.mschapv2.EapMsChapV2ParsingException; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2VariableTypeData; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.exceptions.mschapv2.EapMsChapV2ParsingException; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2VariableTypeData; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/EapAkaPrimeTypeDataTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapAkaPrimeTypeDataTest.java index 36066f1e..6a9e517f 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/EapAkaPrimeTypeDataTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapAkaPrimeTypeDataTest.java @@ -14,33 +14,33 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka; - -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_AUTN; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_KDF; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_KDF_INPUT; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RAND; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_KDF_INPUT; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.KDF_VERSION; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.NETWORK_NAME_BYTES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.NETWORK_NAME_HEX; +package com.android.internal.net.eap.message.simaka; + +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_AUTN; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_KDF; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_KDF_INPUT; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RAND; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_KDF_INPUT; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.KDF_VERSION; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.NETWORK_NAME_BYTES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.NETWORK_NAME_HEX; 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 com.android.ike.eap.message.simaka.EapAkaPrimeTypeData.EapAkaPrimeTypeDataDecoder; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAutn; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtKdf; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtKdfInput; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtMac; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtRandAka; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.message.simaka.EapAkaPrimeTypeData.EapAkaPrimeTypeDataDecoder; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAutn; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtKdf; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtKdfInput; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtMac; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtRandAka; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/EapAkaTypeDataTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapAkaTypeDataTest.java index e5c6f9e8..b2d89d16 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/EapAkaTypeDataTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapAkaTypeDataTest.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka; - -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_CHALLENGE_RESPONSE_MAC_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_CHALLENGE_RESPONSE_TYPE_DATA; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_IDENTITY_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.INVALID_SUBTYPE; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_ANY_ID_REQ; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_AUTN; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_CHECKCODE; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RAND; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RES_BYTES; +package com.android.internal.net.eap.message.simaka; + +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_CHALLENGE_RESPONSE_MAC_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_CHALLENGE_RESPONSE_TYPE_DATA; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_IDENTITY_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.INVALID_SUBTYPE; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_ANY_ID_REQ; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_AUTN; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_CHECKCODE; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RAND; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RES_BYTES; import static junit.framework.TestCase.fail; @@ -38,14 +38,14 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import com.android.ike.eap.message.simaka.EapAkaTypeData.EapAkaTypeDataDecoder; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAutn; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtMac; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtRandAka; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtRes; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.EapSimAkaUnsupportedAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData.EapAkaTypeDataDecoder; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAutn; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtMac; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtRandAka; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtRes; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EapSimAkaUnsupportedAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/EapSimAkaAttributeFactoryTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapSimAkaAttributeFactoryTest.java index 75ea9018..5b6f5d60 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/EapSimAkaAttributeFactoryTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapSimAkaAttributeFactoryTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka; +package com.android.internal.net.eap.message.simaka; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapTestMessageDefinitions.SKIPPABLE_DATA; -import static com.android.ike.eap.message.EapTestMessageDefinitions.SKIPPABLE_DATA_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.SKIPPABLE_INVALID_ATTRIBUTE; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.SKIPPABLE_DATA; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.SKIPPABLE_DATA_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.SKIPPABLE_INVALID_ATTRIBUTE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaUnsupportedAttributeException; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.EapSimAkaUnsupportedAttribute; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaUnsupportedAttributeException; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EapSimAkaUnsupportedAttribute; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/EapSimTypeDataTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapSimTypeDataTest.java index 40b55c19..678a812b 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/EapSimTypeDataTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/EapSimTypeDataTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka; +package com.android.internal.net.eap.message.simaka; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_START_DUPLICATE_ATTRIBUTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_START_SUBTYPE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.INVALID_SUBTYPE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.SHORT_TYPE_DATA; -import static com.android.ike.eap.message.EapTestMessageDefinitions.TYPE_DATA_INVALID_ATTRIBUTE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.TYPE_DATA_INVALID_AT_RAND; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_PERMANENT_ID_REQ; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_VERSION_LIST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_START_DUPLICATE_ATTRIBUTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_START_SUBTYPE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.INVALID_SUBTYPE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.SHORT_TYPE_DATA; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.TYPE_DATA_INVALID_ATTRIBUTE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.TYPE_DATA_INVALID_AT_RAND; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_PERMANENT_ID_REQ; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_VERSION_LIST; import static junit.framework.TestCase.fail; @@ -32,10 +32,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtPermanentIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtVersionList; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.message.simaka.EapSimTypeData.EapSimTypeDataDecoder; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtPermanentIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtVersionList; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.message.simaka.EapSimTypeData.EapSimTypeDataDecoder; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtAutnTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtAutnTest.java index 73f25b71..ebf22e4f 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtAutnTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtAutnTest.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_AUTN; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_AUTN; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_AUTN_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AUTN_BYTES; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_AUTN; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_AUTN; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_AUTN_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AUTN_BYTES; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapAkaAttributeFactory; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAutn; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapAkaAttributeFactory; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAutn; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtAutsTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtAutsTest.java index afd64fe4..d65a735f 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtAutsTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtAutsTest.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_AUTS; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_AUTS; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_AUTS_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AUTS_BYTES; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_AUTS; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_AUTS; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_AUTS_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AUTS_BYTES; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapAkaAttributeFactory; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAuts; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapAkaAttributeFactory; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAuts; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtBiddingTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtBiddingTest.java index 3e6374e8..efdfcc2e 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtBiddingTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtBiddingTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_BIDDING; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_BIDDING_DOES_NOT_SUPPORT_AKA_PRIME; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_BIDDING_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_BIDDING_SUPPORTS_AKA_PRIME; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_BIDDING; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_BIDDING_DOES_NOT_SUPPORT_AKA_PRIME; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_BIDDING_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_BIDDING_SUPPORTS_AKA_PRIME; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -27,10 +27,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapAkaAttributeFactory; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtBidding; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapAkaAttributeFactory; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtBidding; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtClientErrorCodeTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtClientErrorCodeTest.java index 94aa9d9c..2051414c 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtClientErrorCodeTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtClientErrorCodeTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.TestUtils.hexStringToInt; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_CLIENT_ERROR_CODE; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_CLIENT_ERROR_CODE; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_CLIENT_ERROR_CODE_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.ERROR_CODE; +import static com.android.internal.net.TestUtils.hexStringToInt; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_CLIENT_ERROR_CODE; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_CLIENT_ERROR_CODE; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_CLIENT_ERROR_CODE_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.ERROR_CODE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -28,9 +28,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; -import com.android.ike.eap.message.simaka.EapSimAkaAttributeFactory; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtCounterTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtCounterTest.java index 9f9a6d2f..eb1086d5 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtCounterTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtCounterTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_COUNTER; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_COUNTER_TOO_SMALL; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_COUNTER; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_COUNTER_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_COUNTER_TOO_SMALL; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_COUNTER_TOO_SMALL_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.COUNTER_INT; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_COUNTER; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_COUNTER_TOO_SMALL; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_COUNTER; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_COUNTER_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_COUNTER_TOO_SMALL; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_COUNTER_TOO_SMALL_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.COUNTER_INT; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -30,11 +30,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtCounter; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtCounterTooSmall; -import com.android.ike.eap.message.simaka.EapSimAkaAttributeFactory; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtCounter; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtCounterTooSmall; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtIdReqTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtIdReqTest.java index 18c74f1c..d006053e 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtIdReqTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtIdReqTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; - -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_ANY_ID_REQ; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_FULLAUTH_ID_REQ; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_PERMANENT_ID_REQ; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.ANY_ID_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_ANY_ID_REQ; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_FULL_AUTH_ID_REQ; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_PERMANENT_ID_REQ; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.FULL_AUTH_ID_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.PERMANENT_ID_INVALID_LENGTH; +package com.android.internal.net.eap.message.simaka.attributes; + +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_ANY_ID_REQ; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_FULLAUTH_ID_REQ; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_PERMANENT_ID_REQ; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.ANY_ID_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_ANY_ID_REQ; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_FULL_AUTH_ID_REQ; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_PERMANENT_ID_REQ; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.FULL_AUTH_ID_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.PERMANENT_ID_INVALID_LENGTH; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -32,12 +32,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtFullauthIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtPermanentIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaAttributeFactory; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtFullauthIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtPermanentIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtIdentityTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtIdentityTest.java index 9844c493..cf8e8803 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtIdentityTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtIdentityTest.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_IDENTITY; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_IDENTITY; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.IDENTITY; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_IDENTITY; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_IDENTITY; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.IDENTITY; 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 com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtIdentity; -import com.android.ike.eap.message.simaka.EapSimAkaAttributeFactory; -import com.android.ike.eap.message.simaka.EapSimAttributeFactory; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtIdentity; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttributeFactory; +import com.android.internal.net.eap.message.simaka.EapSimAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtKdfInputTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtKdfInputTest.java index dc13f087..51ea3f14 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtKdfInputTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtKdfInputTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_KDF_INPUT; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_KDF_INPUT; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_KDF_INPUT_EMPTY_NETWORK_NAME; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.NETWORK_NAME_BYTES; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_KDF_INPUT; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_KDF_INPUT; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_KDF_INPUT_EMPTY_NETWORK_NAME; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.NETWORK_NAME_BYTES; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import com.android.ike.eap.message.simaka.EapAkaPrimeAttributeFactory; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtKdfInput; +import com.android.internal.net.eap.message.simaka.EapAkaPrimeAttributeFactory; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtKdfInput; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtKdfTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtKdfTest.java index 0a1209c8..0bb07326 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtKdfTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtKdfTest.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_KDF; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_KDF; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_KDF_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.KDF_VERSION; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_KDF; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_KDF; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_KDF_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.KDF_VERSION; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapAkaPrimeAttributeFactory; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtKdf; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapAkaPrimeAttributeFactory; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtKdf; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtMacTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtMacTest.java index ca4c4b98..82b066d5 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtMacTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtMacTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_MAC; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_MAC_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.MAC; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_MAC; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_MAC_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.MAC; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -28,10 +28,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtMac; -import com.android.ike.eap.message.simaka.EapSimAkaAttributeFactory; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtMac; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtNonceMtTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtNonceMtTest.java index a83aa9a4..751908a2 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtNonceMtTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtNonceMtTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_NONCE_MT; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NONCE_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NONCE_MT; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_NONCE_MT; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NONCE_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NONCE_MT; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -27,10 +27,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNonceMt; -import com.android.ike.eap.message.simaka.EapSimAttributeFactory; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNonceMt; +import com.android.internal.net.eap.message.simaka.EapSimAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtNonceSTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtNonceSTest.java index 06af7494..1ad64669 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtNonceSTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtNonceSTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_NONCE_S; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NONCE_S; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NONCE_S_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_S; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_NONCE_S; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NONCE_S; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NONCE_S_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_S; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -28,10 +28,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNonceS; -import com.android.ike.eap.message.simaka.EapSimAkaAttributeFactory; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNonceS; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtNotificationTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtNotificationTest.java index f51b3903..2db3cbb2 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtNotificationTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtNotificationTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.TestUtils.hexStringToInt; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_POST_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_NOTIFICATION; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NOTIFICATION; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NOTIFICATION_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NOTIFICATION_INVALID_STATE; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.NOTIFICATION_CODE; +import static com.android.internal.net.TestUtils.hexStringToInt; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_POST_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_NOTIFICATION; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NOTIFICATION; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NOTIFICATION_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_NOTIFICATION_INVALID_STATE; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.NOTIFICATION_CODE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -32,10 +32,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification; -import com.android.ike.eap.message.simaka.EapSimAkaAttributeFactory; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtPaddingTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtPaddingTest.java index 58a6ce7f..d310d504 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtPaddingTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtPaddingTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_PADDING; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_PADDING; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_PADDING_INVALID_PADDING; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_PADDING; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_PADDING; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_PADDING_INVALID_PADDING; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -26,10 +26,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAtPaddingException; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtPadding; -import com.android.ike.eap.message.simaka.EapSimAkaAttributeFactory; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAtPaddingException; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtPadding; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtRandAkaTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtRandAkaTest.java index 851a1720..bdffdda9 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtRandAkaTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtRandAkaTest.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RAND; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RAND_AKA; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RAND_AKA_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1_BYTES; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RAND; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RAND_AKA; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RAND_AKA_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1_BYTES; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapAkaAttributeFactory; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtRandAka; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapAkaAttributeFactory; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtRandAka; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtRandSimTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtRandSimTest.java index 1d3e9b35..7456be6c 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtRandSimTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtRandSimTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RAND; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RAND_SIM; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RAND_SIM_DUPLICATE_RANDS; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RAND_SIM_INVALID_NUM_RANDS; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_2; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RAND; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RAND_SIM; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RAND_SIM_DUPLICATE_RANDS; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RAND_SIM_INVALID_NUM_RANDS; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_2; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -30,11 +30,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.exceptions.simaka.EapSimInvalidAtRandException; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtRandSim; -import com.android.ike.eap.message.simaka.EapSimAttributeFactory; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.exceptions.simaka.EapSimInvalidAtRandException; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtRandSim; +import com.android.internal.net.eap.message.simaka.EapSimAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtResTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtResTest.java index 4f97498d..34c2ff39 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtResTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtResTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RES_INVALID_RES_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RES_LONG_RES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RES_SHORT_RES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RES_BYTES; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RES_INVALID_RES_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RES_LONG_RES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_RES_SHORT_RES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RES_BYTES; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -29,10 +29,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapAkaAttributeFactory; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtRes; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapAkaAttributeFactory; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtRes; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtSelectedVersionTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtSelectedVersionTest.java index 1d9c5591..659fe9a8 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtSelectedVersionTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtSelectedVersionTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_SELECTED_VERSION; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_SELECTED_VERSION; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_SELECTED_VERSION_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_SELECTED_VERSION; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_SELECTED_VERSION; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_SELECTED_VERSION_INVALID_LENGTH; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -26,10 +26,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtSelectedVersion; -import com.android.ike.eap.message.simaka.EapSimAttributeFactory; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtSelectedVersion; +import com.android.internal.net.eap.message.simaka.EapSimAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtVersionListTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtVersionListTest.java index 69cda932..96bb7ca3 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/AtVersionListTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/AtVersionListTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.TestUtils.hexStringToInt; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_VERSION_LIST; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_VERSION_LIST; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_VERSION_LIST_INVALID_LENGTH; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.VERSION; +import static com.android.internal.net.TestUtils.hexStringToInt; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_VERSION_LIST; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_VERSION_LIST; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_VERSION_LIST_INVALID_LENGTH; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.VERSION; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -28,10 +28,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtVersionList; -import com.android.ike.eap.message.simaka.EapSimAttributeFactory; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtVersionList; +import com.android.internal.net.eap.message.simaka.EapSimAttributeFactory; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/EapSimAkaAttributeTest.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/EapSimAkaAttributeTest.java index 3cc7b50f..98ea222c 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/EapSimAkaAttributeTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/EapSimAkaAttributeTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/EapTestAttributeDefinitions.java b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/EapTestAttributeDefinitions.java index 01a7da1d..60397e1f 100644 --- a/tests/iketests/src/java/com/android/ike/eap/message/simaka/attributes/EapTestAttributeDefinitions.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/message/simaka/attributes/EapTestAttributeDefinitions.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.ike.eap.message.simaka.attributes; +package com.android.internal.net.eap.message.simaka.attributes; -import static com.android.ike.TestUtils.hexStringToByteArray; +import static com.android.internal.net.TestUtils.hexStringToByteArray; /** * EapTestAttributeDefinitions provides byte[] encodings of commonly used EAP Messages. diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/CreatedStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/CreatedStateTest.java index c4978d84..a452fa6f 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/CreatedStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/CreatedStateTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_IDENTITY_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_IDENTITY_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; @@ -29,10 +29,10 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.statemachine.EapStateMachine.IdentityState; -import com.android.ike.eap.statemachine.EapStateMachine.MethodState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.statemachine.EapStateMachine.IdentityState; +import com.android.internal.net.eap.statemachine.EapStateMachine.MethodState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaChallengeStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaChallengeStateTest.java index feb02439..b07d1ff3 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaChallengeStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaChallengeStateTest.java @@ -14,32 +14,32 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; - -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapData.EAP_IDENTITY; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_FAILURE; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_SUCCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.CK_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_AUTHENTICATION_REJECT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_CHALLENGE_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_CLIENT_ERROR_UNABLE_TO_PROCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_SYNCHRONIZATION_FAILURE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_UICC_RESP_INVALID_TAG; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_UICC_RESP_SUCCESS_BASE_64; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_UICC_RESP_SYNCHRONIZE_BASE_64; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EMSK; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.IK_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSK; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AUTN_BYTES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AUTS_BYTES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.IDENTITY; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1_BYTES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RES_BYTES; +package com.android.internal.net.eap.statemachine; + +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapData.EAP_IDENTITY; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_FAILURE; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_SUCCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.CK_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_AUTHENTICATION_REJECT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_CHALLENGE_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_CLIENT_ERROR_UNABLE_TO_PROCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_SYNCHRONIZATION_FAILURE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_UICC_RESP_INVALID_TAG; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_UICC_RESP_SUCCESS_BASE_64; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_UICC_RESP_SYNCHRONIZE_BASE_64; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EMSK; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.IK_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSK; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AUTN_BYTES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AUTS_BYTES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.IDENTITY; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1_BYTES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RES_BYTES; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertNull; @@ -52,25 +52,25 @@ import static org.mockito.Mockito.when; import android.telephony.TelephonyManager; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapFailure; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.EapResult.EapSuccess; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.exceptions.simaka.EapAkaInvalidAuthenticationResponse; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidLengthException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapAkaTypeData; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAutn; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtBidding; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtMac; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtRandAka; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.statemachine.EapAkaMethodStateMachine.ChallengeState; -import com.android.ike.eap.statemachine.EapAkaMethodStateMachine.ChallengeState.RandChallengeResult; -import com.android.ike.eap.statemachine.EapMethodStateMachine.FinalState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapFailure; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.EapResult.EapSuccess; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.exceptions.simaka.EapAkaInvalidAuthenticationResponse; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidLengthException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAutn; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtBidding; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtMac; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtRandAka; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.statemachine.EapAkaMethodStateMachine.ChallengeState; +import com.android.internal.net.eap.statemachine.EapAkaMethodStateMachine.ChallengeState.RandChallengeResult; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.FinalState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaCreatedStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaCreatedStateTest.java index c32fefac..6e100dbf 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaCreatedStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaCreatedStateTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_FAILURE; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_SUCCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_FAILURE; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_SUCCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; @@ -32,17 +32,17 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapFailure; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapAkaTypeData; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.statemachine.EapAkaMethodStateMachine.ChallengeState; -import com.android.ike.eap.statemachine.EapAkaMethodStateMachine.IdentityState; -import com.android.ike.eap.statemachine.EapMethodStateMachine.FinalState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapFailure; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.statemachine.EapAkaMethodStateMachine.ChallengeState; +import com.android.internal.net.eap.statemachine.EapAkaMethodStateMachine.IdentityState; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.FinalState; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaIdentityStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaIdentityStateTest.java index dcfeb0f1..20175f95 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaIdentityStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaIdentityStateTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_CLIENT_ERROR_UNABLE_TO_PROCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_IDENTITY_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.IMSI; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_CLIENT_ERROR_UNABLE_TO_PROCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_IDENTITY_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.IMSI; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; @@ -33,17 +33,17 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.exceptions.simaka.EapSimAkaIdentityUnavailableException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapAkaTypeData; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtPermanentIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.statemachine.EapAkaMethodStateMachine.ChallengeState; -import com.android.ike.eap.statemachine.EapAkaMethodStateMachine.IdentityState; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaIdentityUnavailableException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtPermanentIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.statemachine.EapAkaMethodStateMachine.ChallengeState; +import com.android.internal.net.eap.statemachine.EapAkaMethodStateMachine.IdentityState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaMethodStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaMethodStateMachineTest.java index 12e33c8b..db2899b6 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaMethodStateMachineTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaMethodStateMachineTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; import static android.telephony.TelephonyManager.APPTYPE_USIM; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_CLIENT_ERROR_UNABLE_TO_PROCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_NOTIFICATION_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.IMSI; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_NOTIFICATION; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_PRE_CHALLENGE; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_CLIENT_ERROR_UNABLE_TO_PROCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_NOTIFICATION_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.IMSI; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_NOTIFICATION; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_PRE_CHALLENGE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -40,20 +40,20 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import android.net.eap.EapSessionConfig.EapAkaConfig; import android.telephony.TelephonyManager; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.EapSessionConfig.EapAkaConfig; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapAkaTypeData; -import com.android.ike.eap.message.simaka.EapAkaTypeData.EapAkaTypeDataDecoder; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.statemachine.EapAkaMethodStateMachine.CreatedState; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData.EapAkaTypeDataDecoder; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.statemachine.EapAkaMethodStateMachine.CreatedState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeChallengeStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeChallengeStateTest.java index a768376f..731eb6bd 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeChallengeStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeChallengeStateTest.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; import static android.telephony.TelephonyManager.APPTYPE_USIM; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA_PRIME; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.CK_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_AUTHENTICATION_REJECT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_IDENTITY_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_IDENTITY_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.IK_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.IMSI; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AUTN_BYTES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.MAC_BYTES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1_BYTES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RES_BYTES; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA_PRIME; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.CK_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_AUTHENTICATION_REJECT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_IDENTITY_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_IDENTITY_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.IK_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.IMSI; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AUTN_BYTES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.MAC_BYTES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1_BYTES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RES_BYTES; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse; @@ -44,21 +44,22 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.EapSessionConfig; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapAkaPrimeTypeData; -import com.android.ike.eap.message.simaka.EapAkaTypeData; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAutn; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtKdf; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtKdfInput; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtMac; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtRandAka; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.statemachine.EapAkaMethodStateMachine.ChallengeState.RandChallengeResult; -import com.android.ike.eap.statemachine.EapAkaPrimeMethodStateMachine.ChallengeState; +import android.net.eap.EapSessionConfig; + +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapAkaPrimeTypeData; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAutn; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtKdf; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtKdfInput; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtMac; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtRandAka; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.statemachine.EapAkaMethodStateMachine.ChallengeState.RandChallengeResult; +import com.android.internal.net.eap.statemachine.EapAkaPrimeMethodStateMachine.ChallengeState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeCreatedStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeCreatedStateTest.java index 8664cdab..90d0bf66 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeCreatedStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeCreatedStateTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA_PRIME; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA_PRIME; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; @@ -30,12 +30,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapAkaPrimeTypeData; -import com.android.ike.eap.message.simaka.EapAkaTypeData; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.statemachine.EapAkaPrimeMethodStateMachine.ChallengeState; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapAkaPrimeTypeData; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.statemachine.EapAkaPrimeMethodStateMachine.ChallengeState; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeIdentityStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeIdentityStateTest.java index 0ce5a45a..73191fb0 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeIdentityStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeIdentityStateTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA_PRIME; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_IDENTITY_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.IMSI; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA_PRIME; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_IDENTITY_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.IMSI; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_IDENTITY; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; @@ -32,14 +32,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapAkaPrimeTypeData; -import com.android.ike.eap.message.simaka.EapAkaTypeData; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.statemachine.EapAkaPrimeMethodStateMachine.ChallengeState; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapAkaPrimeTypeData; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.statemachine.EapAkaPrimeMethodStateMachine.ChallengeState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeMethodStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeMethodStateMachineTest.java index ce46dc42..125b3235 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeMethodStateMachineTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeMethodStateMachineTest.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA_PRIME; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; -import static com.android.ike.eap.statemachine.EapAkaPrimeMethodStateMachine.K_AUT_LEN; -import static com.android.ike.eap.statemachine.EapAkaPrimeMethodStateMachine.K_RE_LEN; -import static com.android.ike.eap.statemachine.EapSimAkaMethodStateMachine.KEY_LEN; -import static com.android.ike.eap.statemachine.EapSimAkaMethodStateMachine.SESSION_KEY_LENGTH; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA_PRIME; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_CHALLENGE; +import static com.android.internal.net.eap.statemachine.EapAkaPrimeMethodStateMachine.K_AUT_LEN; +import static com.android.internal.net.eap.statemachine.EapAkaPrimeMethodStateMachine.K_RE_LEN; +import static com.android.internal.net.eap.statemachine.EapSimAkaMethodStateMachine.KEY_LEN; +import static com.android.internal.net.eap.statemachine.EapSimAkaMethodStateMachine.SESSION_KEY_LENGTH; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapAkaPrimeTypeData; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtMac; -import com.android.ike.eap.statemachine.EapAkaMethodStateMachine.CreatedState; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapAkaPrimeTypeData; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtMac; +import com.android.internal.net.eap.statemachine.EapAkaMethodStateMachine.CreatedState; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeStateTest.java index 98d7bc38..18fce265 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeStateTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.eap.message.EapData.EAP_NOTIFICATION; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA_PRIME; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_FAILURE; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_SUCCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_CLIENT_ERROR_UNABLE_TO_PROCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapData.EAP_NOTIFICATION; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA_PRIME; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_FAILURE; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_SUCCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_CLIENT_ERROR_UNABLE_TO_PROCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -33,18 +33,18 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapFailure; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapAkaTypeData; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.statemachine.EapMethodStateMachine.EapMethodState; -import com.android.ike.eap.statemachine.EapMethodStateMachine.FinalState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapFailure; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.EapMethodState; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.FinalState; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeTest.java index 4a8e3941..48371bbd 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaPrimeTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaPrimeTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; import static android.telephony.TelephonyManager.APPTYPE_USIM; -import static com.android.ike.TestUtils.hexStringToByteArray; +import static com.android.internal.net.TestUtils.hexStringToByteArray; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -26,10 +26,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; +import android.net.eap.EapSessionConfig.EapAkaPrimeConfig; import android.telephony.TelephonyManager; -import com.android.ike.eap.EapSessionConfig.EapAkaPrimeConfig; -import com.android.ike.eap.message.simaka.EapAkaPrimeTypeData; +import com.android.internal.net.eap.message.simaka.EapAkaPrimeTypeData; import org.junit.Before; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaStateTest.java index 0347b669..23b240b9 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapAkaStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapAkaStateTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; import static android.telephony.TelephonyManager.APPTYPE_USIM; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapData.EAP_NOTIFICATION; -import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_CLIENT_ERROR_UNABLE_TO_PROCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_NOTIFICATION_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.simaka.EapAkaTypeData.EAP_AKA_NOTIFICATION; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_PRE_CHALLENGE; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapData.EAP_NOTIFICATION; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_AKA; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_CLIENT_ERROR_UNABLE_TO_PROCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_NOTIFICATION_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.simaka.EapAkaTypeData.EAP_AKA_NOTIFICATION; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_PRE_CHALLENGE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -38,19 +38,19 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import android.net.eap.EapSessionConfig.EapAkaConfig; import android.telephony.TelephonyManager; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.EapSessionConfig.EapAkaConfig; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapAkaTypeData; -import com.android.ike.eap.message.simaka.EapAkaTypeData.EapAkaTypeDataDecoder; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.statemachine.EapMethodStateMachine.EapMethodState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData; +import com.android.internal.net.eap.message.simaka.EapAkaTypeData.EapAkaTypeDataDecoder; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.EapMethodState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2AwaitingEapFailureStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2AwaitingEapFailureStateTest.java index f9140007..1dd60c0c 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2AwaitingEapFailureStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2AwaitingEapFailureStateTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; import org.junit.Before; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2AwaitingEapSuccessStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2AwaitingEapSuccessStateTest.java index b5508f39..d4377cb6 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2AwaitingEapSuccessStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2AwaitingEapSuccessStateTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_SUCCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_MSK; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_NT_RESPONSE; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_SUCCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_MSK; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_NT_RESPONSE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapSuccess; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.statemachine.EapMethodStateMachine.FinalState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapSuccess; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.FinalState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2ChallengeStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2ChallengeStateTest.java index 8f19ba80..ec442dab 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2ChallengeStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2ChallengeStateTest.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.eap.message.EapData.EAP_TYPE_MSCHAP_V2; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_MSCHAP_V2_CHALLENGE_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_AUTHENTICATOR_CHALLENGE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PEER_CHALLENGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SERVER_NAME_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeRequest.TYPE_DATA_HEADER_SIZE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeRequest.VALUE_SIZE; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_MSCHAP_V2; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_MSCHAP_V2_CHALLENGE_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_AUTHENTICATOR_CHALLENGE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PEER_CHALLENGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SERVER_NAME_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeRequest.TYPE_DATA_HEADER_SIZE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeRequest.VALUE_SIZE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; @@ -35,15 +35,15 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.exceptions.mschapv2.EapMsChapV2ParsingException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeRequest; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; -import com.android.ike.eap.statemachine.EapMsChapV2MethodStateMachine.ValidateAuthenticatorState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.exceptions.mschapv2.EapMsChapV2ParsingException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeRequest; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; +import com.android.internal.net.eap.statemachine.EapMsChapV2MethodStateMachine.ValidateAuthenticatorState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2CreatedStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2CreatedStateTest.java index 62ce4e4e..633e0ebd 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2CreatedStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2CreatedStateTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.eap.message.EapData.EAP_TYPE_MSCHAP_V2; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SERVER_NAME_BYTES; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_MSCHAP_V2; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.SERVER_NAME_BYTES; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -29,14 +29,14 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.exceptions.mschapv2.EapMsChapV2ParsingException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeRequest; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; -import com.android.ike.eap.statemachine.EapMsChapV2MethodStateMachine.ValidateAuthenticatorState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.exceptions.mschapv2.EapMsChapV2ParsingException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2ChallengeRequest; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; +import com.android.internal.net.eap.statemachine.EapMsChapV2MethodStateMachine.ValidateAuthenticatorState; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2MethodStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2MethodStateMachineTest.java index 16646a1d..b24c3f82 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2MethodStateMachineTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2MethodStateMachineTest.java @@ -14,32 +14,33 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; - -import static com.android.ike.eap.message.EapData.EAP_TYPE_MSCHAP_V2; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_AUTHENTICATOR_CHALLENGE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_AUTHENTICATOR_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_CHALLENGE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_MASTER_KEY; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_MSK; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_NT_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PASSWORD; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PASSWORD_HASH; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PASSWORD_HASH_HASH; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PASSWORD_UTF_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PEER_CHALLENGE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_RECEIVE_START_KEY; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_SEND_START_KEY; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_USERNAME; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_USERNAME_ASCII_BYTES; +package com.android.internal.net.eap.statemachine; + +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_MSCHAP_V2; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_AUTHENTICATOR_CHALLENGE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_AUTHENTICATOR_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_CHALLENGE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_MASTER_KEY; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_MSK; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_NT_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PASSWORD; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PASSWORD_HASH; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PASSWORD_HASH_HASH; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PASSWORD_UTF_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PEER_CHALLENGE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_RECEIVE_START_KEY; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_SEND_START_KEY; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_USERNAME; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_USERNAME_ASCII_BYTES; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.android.ike.eap.EapSessionConfig.EapMsChapV2Config; -import com.android.ike.eap.statemachine.EapMsChapV2MethodStateMachine.CreatedState; -import com.android.ike.utils.Log; +import android.net.eap.EapSessionConfig.EapMsChapV2Config; + +import com.android.internal.net.eap.statemachine.EapMsChapV2MethodStateMachine.CreatedState; +import com.android.internal.net.utils.Log; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2StateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2StateTest.java index db4325e9..1e4a0c58 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2StateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2StateTest.java @@ -14,34 +14,35 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; - -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapData.EAP_NOTIFICATION; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_FAILURE; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_SUCCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PASSWORD; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_USERNAME; +package com.android.internal.net.eap.statemachine; + +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapData.EAP_NOTIFICATION; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_FAILURE; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_SUCCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PASSWORD; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_USERNAME; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapFailure; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.EapSessionConfig.EapMsChapV2Config; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder; -import com.android.ike.eap.statemachine.EapMethodStateMachine.EapMethodState; -import com.android.ike.eap.statemachine.EapMethodStateMachine.FinalState; +import android.net.eap.EapSessionConfig.EapMsChapV2Config; + +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapFailure; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.EapMethodState; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.FinalState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2ValidateAuthenticatorStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2ValidateAuthenticatorStateTest.java index c7fc84f5..dda7d5bc 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapMsChapV2ValidateAuthenticatorStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapMsChapV2ValidateAuthenticatorStateTest.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; - -import static com.android.ike.eap.message.EapData.EAP_TYPE_MSCHAP_V2; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_MSCHAP_V2_FAILURE_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_MSCHAP_V2_SUCCESS_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.INVALID_AUTHENTICATOR_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_AUTHENTICATOR_CHALLENGE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_AUTHENTICATOR_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_NT_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PEER_CHALLENGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_BYTES; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ERROR_CODE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.PASSWORD_CHANGE_PROTOCOL; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2PacketDefinitions.RETRY_BIT; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_FAILURE; -import static com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_SUCCESS; +package com.android.internal.net.eap.statemachine; + +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_MSCHAP_V2; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_MSCHAP_V2_FAILURE_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_MSCHAP_V2_SUCCESS_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.INVALID_AUTHENTICATOR_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_AUTHENTICATOR_CHALLENGE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_AUTHENTICATOR_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_NT_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSCHAP_V2_PEER_CHALLENGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.CHALLENGE_BYTES; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.ERROR_CODE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.MESSAGE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.PASSWORD_CHANGE_PROTOCOL; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2PacketDefinitions.RETRY_BIT; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_FAILURE; +import static com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EAP_MSCHAP_V2_SUCCESS; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; @@ -42,19 +42,19 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapFailure; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2FailureRequest; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2SuccessRequest; -import com.android.ike.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; -import com.android.ike.eap.statemachine.EapMethodStateMachine.FinalState; -import com.android.ike.eap.statemachine.EapMsChapV2MethodStateMachine.AwaitingEapFailureState; -import com.android.ike.eap.statemachine.EapMsChapV2MethodStateMachine.AwaitingEapSuccessState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapFailure; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2FailureRequest; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2SuccessRequest; +import com.android.internal.net.eap.message.mschapv2.EapMsChapV2TypeData.EapMsChapV2TypeDataDecoder.DecodeResult; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.FinalState; +import com.android.internal.net.eap.statemachine.EapMsChapV2MethodStateMachine.AwaitingEapFailureState; +import com.android.internal.net.eap.statemachine.EapMsChapV2MethodStateMachine.AwaitingEapSuccessState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimAkaMethodStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimAkaMethodStateMachineTest.java index 47721da7..7adc9f75 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimAkaMethodStateMachineTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimAkaMethodStateMachineTest.java @@ -14,55 +14,55 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; - -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapData.EAP_TYPE_SIM; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.COMPUTED_MAC; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_CHALLENGE_RESPONSE_MAC_INPUT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_CHALLENGE_RESPONSE_WITH_MAC; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_CLIENT_ERROR_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_CLIENT_ERROR_UNABLE_TO_PROCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_IDENTITY; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_REQUEST_WITH_EMPTY_MAC; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_RESPONSE_WITH_EMPTY_MAC; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_RESPONSE_WITH_MAC; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_RESPONSE_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EMSK; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EMSK_STRING; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.KC_1; -import static com.android.ike.eap.message.EapTestMessageDefinitions.KC_2; -import static com.android.ike.eap.message.EapTestMessageDefinitions.K_AUT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.K_AUT_STRING; -import static com.android.ike.eap.message.EapTestMessageDefinitions.K_ENCR; -import static com.android.ike.eap.message.EapTestMessageDefinitions.K_ENCR_STRING; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MAC_INPUT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MK; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSK; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSK_STRING; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ORIGINAL_MAC; -import static com.android.ike.eap.message.EapTestMessageDefinitions.SRES_1; -import static com.android.ike.eap.message.EapTestMessageDefinitions.SRES_BYTES; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_POST_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_PRE_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; -import static com.android.ike.eap.message.simaka.EapSimTypeData.EAP_SIM_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapSimTypeData.EAP_SIM_CLIENT_ERROR; -import static com.android.ike.eap.message.simaka.EapSimTypeData.EAP_SIM_NOTIFICATION; -import static com.android.ike.eap.message.simaka.EapSimTypeData.EAP_SIM_START; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_IDENTITY; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.IDENTITY; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT_STRING; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1_BYTES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_2_BYTES; -import static com.android.ike.eap.statemachine.EapSimAkaMethodStateMachine.KEY_LEN; -import static com.android.ike.eap.statemachine.EapSimAkaMethodStateMachine.MAC_ALGORITHM_STRING; -import static com.android.ike.eap.statemachine.EapSimAkaMethodStateMachine.MASTER_KEY_GENERATION_ALG; -import static com.android.ike.eap.statemachine.EapSimAkaMethodStateMachine.SESSION_KEY_LENGTH; +package com.android.internal.net.eap.statemachine; + +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_SIM; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.COMPUTED_MAC; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_CHALLENGE_RESPONSE_MAC_INPUT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_CHALLENGE_RESPONSE_WITH_MAC; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_CLIENT_ERROR_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_CLIENT_ERROR_UNABLE_TO_PROCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_IDENTITY; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_REQUEST_WITH_EMPTY_MAC; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_RESPONSE_WITH_EMPTY_MAC; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_RESPONSE_WITH_MAC; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_RESPONSE_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EMSK; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EMSK_STRING; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.KC_1; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.KC_2; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.K_AUT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.K_AUT_STRING; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.K_ENCR; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.K_ENCR_STRING; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MAC_INPUT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MK; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSK; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSK_STRING; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ORIGINAL_MAC; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.SRES_1; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.SRES_BYTES; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_POST_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_PRE_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; +import static com.android.internal.net.eap.message.simaka.EapSimTypeData.EAP_SIM_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapSimTypeData.EAP_SIM_CLIENT_ERROR; +import static com.android.internal.net.eap.message.simaka.EapSimTypeData.EAP_SIM_NOTIFICATION; +import static com.android.internal.net.eap.message.simaka.EapSimTypeData.EAP_SIM_START; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.AT_IDENTITY; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.IDENTITY; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT_STRING; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1_BYTES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_2_BYTES; +import static com.android.internal.net.eap.statemachine.EapSimAkaMethodStateMachine.KEY_LEN; +import static com.android.internal.net.eap.statemachine.EapSimAkaMethodStateMachine.MAC_ALGORITHM_STRING; +import static com.android.internal.net.eap.statemachine.EapSimAkaMethodStateMachine.MASTER_KEY_GENERATION_ALG; +import static com.android.internal.net.eap.statemachine.EapSimAkaMethodStateMachine.SESSION_KEY_LENGTH; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -80,27 +80,27 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import android.net.eap.EapSessionConfig.EapSimConfig; import android.telephony.TelephonyManager; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.EapSessionConfig.EapSimConfig; -import com.android.ike.eap.crypto.Fips186_2Prf; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.exceptions.simaka.EapSimAkaAuthenticationFailureException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtIdentity; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtMac; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtRandSim; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtSelectedVersion; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData; -import com.android.ike.eap.message.simaka.EapSimTypeData; -import com.android.ike.eap.statemachine.EapMethodStateMachine.EapMethodState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.crypto.Fips186_2Prf; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaAuthenticationFailureException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtIdentity; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtMac; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtRandSim; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtSelectedVersion; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData; +import com.android.internal.net.eap.message.simaka.EapSimTypeData; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.EapMethodState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimChallengeStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimChallengeStateTest.java index 031603e1..bffc03ab 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimChallengeStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimChallengeStateTest.java @@ -14,33 +14,33 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; - -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapData.EAP_IDENTITY; -import static com.android.ike.eap.message.EapData.EAP_TYPE_SIM; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_FAILURE; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_SUCCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.CHALLENGE_RESPONSE_INVALID_KC; -import static com.android.ike.eap.message.EapTestMessageDefinitions.CHALLENGE_RESPONSE_INVALID_SRES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_IDENTITY_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EMSK; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.KC_1_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.KC_2_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSK; -import static com.android.ike.eap.message.EapTestMessageDefinitions.SRES_1_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.SRES_2_BYTES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.VALID_CHALLENGE_RESPONSE; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RAND; -import static com.android.ike.eap.message.simaka.EapSimTypeData.EAP_SIM_CHALLENGE; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1_BYTES; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_2; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_2_BYTES; +package com.android.internal.net.eap.statemachine; + +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapData.EAP_IDENTITY; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_SIM; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_FAILURE; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_SUCCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.CHALLENGE_RESPONSE_INVALID_KC; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.CHALLENGE_RESPONSE_INVALID_SRES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_IDENTITY_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EMSK; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.KC_1_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.KC_2_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSK; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.SRES_1_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.SRES_2_BYTES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.VALID_CHALLENGE_RESPONSE; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_RAND; +import static com.android.internal.net.eap.message.simaka.EapSimTypeData.EAP_SIM_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_1_BYTES; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_2; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.RAND_2_BYTES; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -55,25 +55,25 @@ import static org.mockito.Mockito.when; import android.telephony.TelephonyManager; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapFailure; -import com.android.ike.eap.EapResult.EapSuccess; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.exceptions.simaka.EapSimAkaAuthenticationFailureException; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; -import com.android.ike.eap.exceptions.simaka.EapSimAkaInvalidLengthException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtMac; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNonceMt; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtRandSim; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.message.simaka.EapSimTypeData; -import com.android.ike.eap.statemachine.EapMethodStateMachine.FinalState; -import com.android.ike.eap.statemachine.EapSimMethodStateMachine.ChallengeState; -import com.android.ike.eap.statemachine.EapSimMethodStateMachine.ChallengeState.RandChallengeResult; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapFailure; +import com.android.internal.net.eap.EapResult.EapSuccess; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaAuthenticationFailureException; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidAttributeException; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaInvalidLengthException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtMac; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNonceMt; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtRandSim; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.message.simaka.EapSimTypeData; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.FinalState; +import com.android.internal.net.eap.statemachine.EapSimMethodStateMachine.ChallengeState; +import com.android.internal.net.eap.statemachine.EapSimMethodStateMachine.ChallengeState.RandChallengeResult; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimCreatedStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimCreatedStateTest.java index 2ccda480..bdd19201 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimCreatedStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimCreatedStateTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.eap.message.EapData.EAP_IDENTITY; -import static com.android.ike.eap.message.EapData.EAP_TYPE_SIM; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_FAILURE; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_SUCCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapData.EAP_IDENTITY; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_SIM; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_FAILURE; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_SUCCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.eq; @@ -30,20 +30,20 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapFailure; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtPermanentIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtVersionList; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.message.simaka.EapSimTypeData; -import com.android.ike.eap.statemachine.EapMethodStateMachine.FinalState; -import com.android.ike.eap.statemachine.EapSimMethodStateMachine.CreatedState; -import com.android.ike.eap.statemachine.EapSimMethodStateMachine.StartState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapFailure; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtPermanentIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtVersionList; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.message.simaka.EapSimTypeData; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.FinalState; +import com.android.internal.net.eap.statemachine.EapSimMethodStateMachine.CreatedState; +import com.android.internal.net.eap.statemachine.EapSimMethodStateMachine.StartState; import org.junit.Before; import org.junit.Test; @@ -51,7 +51,6 @@ import org.junit.Test; import java.util.Arrays; import java.util.List; - public class EapSimCreatedStateTest extends EapSimStateTest { private static final int EAP_SIM_START = 10; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimMethodStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimMethodStateMachineTest.java index 8aa41311..ac1d01ca 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimMethodStateMachineTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimMethodStateMachineTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; import static android.telephony.TelephonyManager.APPTYPE_USIM; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapData.EAP_TYPE_SIM; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_CLIENT_ERROR_UNABLE_TO_PROCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_PRE_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapSimTypeData.EAP_SIM_NOTIFICATION; -import static com.android.ike.eap.message.simaka.EapSimTypeData.EAP_SIM_START; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_SIM; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_CLIENT_ERROR_UNABLE_TO_PROCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_PRE_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapSimTypeData.EAP_SIM_NOTIFICATION; +import static com.android.internal.net.eap.message.simaka.EapSimTypeData.EAP_SIM_START; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -39,21 +39,21 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import android.net.eap.EapSessionConfig.EapSimConfig; import android.telephony.TelephonyManager; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.EapSessionConfig.EapSimConfig; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtVersionList; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.message.simaka.EapSimTypeData; -import com.android.ike.eap.message.simaka.EapSimTypeData.EapSimTypeDataDecoder; -import com.android.ike.eap.statemachine.EapSimMethodStateMachine.CreatedState; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtVersionList; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.message.simaka.EapSimTypeData; +import com.android.internal.net.eap.message.simaka.EapSimTypeData.EapSimTypeDataDecoder; +import com.android.internal.net.eap.statemachine.EapSimMethodStateMachine.CreatedState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimStartStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimStartStateTest.java index 4965c8fa..ccb746ab 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimStartStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimStartStateTest.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; - -import static com.android.ike.eap.message.EapData.EAP_IDENTITY; -import static com.android.ike.eap.message.EapData.EAP_TYPE_SIM; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_FAILURE; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_SUCCESS; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_IDENTITY; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_RESPONSE_WITHOUT_IDENTITY; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.IMSI; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_ANY_ID_REQ; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_ENCR_DATA; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_IV; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_PERMANENT_ID_REQ; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.EAP_AT_VERSION_LIST; -import static com.android.ike.eap.message.simaka.EapSimTypeData.EAP_SIM_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapSimTypeData.EAP_SIM_START; -import static com.android.ike.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT; +package com.android.internal.net.eap.statemachine; + +import static com.android.internal.net.eap.message.EapData.EAP_IDENTITY; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_SIM; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_FAILURE; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_SUCCESS; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_IDENTITY; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_RESPONSE_WITHOUT_IDENTITY; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.IMSI; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_ANY_ID_REQ; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_ENCR_DATA; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_IV; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_MAC; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_PERMANENT_ID_REQ; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.EAP_AT_VERSION_LIST; +import static com.android.internal.net.eap.message.simaka.EapSimTypeData.EAP_SIM_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapSimTypeData.EAP_SIM_START; +import static com.android.internal.net.eap.message.simaka.attributes.EapTestAttributeDefinitions.NONCE_MT; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse; @@ -46,27 +46,27 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapFailure; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.exceptions.simaka.EapSimAkaIdentityUnavailableException; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtIdentity; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtMac; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNonceMt; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtPermanentIdReq; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtVersionList; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.message.simaka.EapSimTypeData; -import com.android.ike.eap.statemachine.EapMethodStateMachine.FinalState; -import com.android.ike.eap.statemachine.EapSimMethodStateMachine.ChallengeState; -import com.android.ike.eap.statemachine.EapSimMethodStateMachine.StartState; -import com.android.ike.utils.Log; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapFailure; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.exceptions.simaka.EapSimAkaIdentityUnavailableException; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtAnyIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtIdentity; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtMac; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNonceMt; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtPermanentIdReq; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtVersionList; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.message.simaka.EapSimTypeData; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.FinalState; +import com.android.internal.net.eap.statemachine.EapSimMethodStateMachine.ChallengeState; +import com.android.internal.net.eap.statemachine.EapSimMethodStateMachine.StartState; +import com.android.internal.net.utils.Log; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimStateTest.java index 9a0a3c2c..d8d18416 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapSimStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapSimStateTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; import static android.telephony.TelephonyManager.APPTYPE_USIM; -import static com.android.ike.TestUtils.hexStringToByteArray; -import static com.android.ike.eap.message.EapData.EAP_NOTIFICATION; -import static com.android.ike.eap.message.EapData.EAP_TYPE_SIM; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_CLIENT_ERROR_INSUFFICIENT_CHALLENGES; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_RESPONSE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_PRE_CHALLENGE; -import static com.android.ike.eap.message.simaka.EapSimTypeData.EAP_SIM_NOTIFICATION; +import static com.android.internal.net.TestUtils.hexStringToByteArray; +import static com.android.internal.net.eap.message.EapData.EAP_NOTIFICATION; +import static com.android.internal.net.eap.message.EapData.EAP_TYPE_SIM; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_CLIENT_ERROR_INSUFFICIENT_CHALLENGES; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SIM_NOTIFICATION_RESPONSE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification.GENERAL_FAILURE_PRE_CHALLENGE; +import static com.android.internal.net.eap.message.simaka.EapSimTypeData.EAP_SIM_NOTIFICATION; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -38,19 +38,19 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import android.net.eap.EapSessionConfig.EapSimConfig; import android.telephony.TelephonyManager; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.EapSessionConfig.EapSimConfig; -import com.android.ike.eap.message.EapData; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; -import com.android.ike.eap.message.simaka.EapSimAkaAttribute.AtNotification; -import com.android.ike.eap.message.simaka.EapSimAkaTypeData.DecodeResult; -import com.android.ike.eap.message.simaka.EapSimTypeData; -import com.android.ike.eap.message.simaka.EapSimTypeData.EapSimTypeDataDecoder; -import com.android.ike.eap.statemachine.EapMethodStateMachine.EapMethodState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.message.EapData; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtClientErrorCode; +import com.android.internal.net.eap.message.simaka.EapSimAkaAttribute.AtNotification; +import com.android.internal.net.eap.message.simaka.EapSimAkaTypeData.DecodeResult; +import com.android.internal.net.eap.message.simaka.EapSimTypeData; +import com.android.internal.net.eap.message.simaka.EapSimTypeData.EapSimTypeDataDecoder; +import com.android.internal.net.eap.statemachine.EapMethodStateMachine.EapMethodState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapStateMachineTest.java index 4ef2a6d7..288fc85f 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapStateMachineTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapStateMachineTest.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; import static androidx.test.InstrumentationRegistry.getInstrumentation; -import static com.android.ike.eap.EapTestUtils.getDummyEapSessionConfig; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SUCCESS_PACKET; +import static com.android.internal.net.eap.EapTestUtils.getDummyEapSessionConfig; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SUCCESS_PACKET; import static org.junit.Assert.assertTrue; import android.content.Context; +import android.net.eap.EapSessionConfig; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapSessionConfig; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.statemachine.EapStateMachine.CreatedState; -import com.android.ike.eap.statemachine.EapStateMachine.FailureState; -import com.android.ike.eap.statemachine.EapStateMachine.SuccessState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.statemachine.EapStateMachine.CreatedState; +import com.android.internal.net.eap.statemachine.EapStateMachine.FailureState; +import com.android.internal.net.eap.statemachine.EapStateMachine.SuccessState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapStateTest.java index ed6e08ac..0193cb4e 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/EapStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/EapStateTest.java @@ -14,30 +14,30 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; import static androidx.test.InstrumentationRegistry.getInstrumentation; -import static com.android.ike.eap.EapTestUtils.getDummyEapSimSessionConfig; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_MD5_CHALLENGE; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_NAK_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NAK_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.REQUEST_UNSUPPORTED_TYPE_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.SHORT_PACKET; +import static com.android.internal.net.eap.EapTestUtils.getDummyEapSimSessionConfig; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_MD5_CHALLENGE; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_NAK_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NAK_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.REQUEST_UNSUPPORTED_TYPE_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.SHORT_PACKET; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; import android.content.Context; - -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.EapSessionConfig; -import com.android.ike.eap.exceptions.EapInvalidPacketLengthException; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.statemachine.EapStateMachine.EapState; +import android.net.eap.EapSessionConfig; + +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.exceptions.EapInvalidPacketLengthException; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.statemachine.EapStateMachine.EapState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/IdentityStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/IdentityStateTest.java index 6ba04e93..abe4e824 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/IdentityStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/IdentityStateTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; -import static com.android.ike.eap.EapTestUtils.getDummyEapSessionConfig; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_IDENTITY; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_IDENTITY_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_IDENTITY_DEFAULT_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_IDENTITY_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.EapTestUtils.getDummyEapSessionConfig; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_IDENTITY; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_IDENTITY_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_IDENTITY_DEFAULT_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_IDENTITY_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; @@ -33,9 +33,9 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.statemachine.EapStateMachine.MethodState; +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.statemachine.EapStateMachine.MethodState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/eap/statemachine/MethodStateTest.java b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/MethodStateTest.java index c719e7f7..9df06e56 100644 --- a/tests/iketests/src/java/com/android/ike/eap/statemachine/MethodStateTest.java +++ b/tests/iketests/src/java/com/android/internal/net/eap/statemachine/MethodStateTest.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package com.android.ike.eap.statemachine; +package com.android.internal.net.eap.statemachine; import static android.telephony.TelephonyManager.APPTYPE_USIM; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_FAILURE; -import static com.android.ike.eap.message.EapMessage.EAP_CODE_SUCCESS; -import static com.android.ike.eap.message.EapMessage.EAP_HEADER_LENGTH; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_REQUEST; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_FAILURE_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_AKA; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_IDENTITY_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_MSCHAP_V2; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NAK_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EAP_SUCCESS_PACKET; -import static com.android.ike.eap.message.EapTestMessageDefinitions.EMSK; -import static com.android.ike.eap.message.EapTestMessageDefinitions.ID_INT; -import static com.android.ike.eap.message.EapTestMessageDefinitions.MSK; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_FAILURE; +import static com.android.internal.net.eap.message.EapMessage.EAP_CODE_SUCCESS; +import static com.android.internal.net.eap.message.EapMessage.EAP_HEADER_LENGTH; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_AKA_PRIME_REQUEST; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_FAILURE_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_AKA; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_IDENTITY_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_MSCHAP_V2; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_REQUEST_SIM_START_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NAK_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_RESPONSE_NOTIFICATION_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EAP_SUCCESS_PACKET; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.EMSK; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.ID_INT; +import static com.android.internal.net.eap.message.EapTestMessageDefinitions.MSK; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; @@ -43,17 +43,18 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.android.ike.eap.EapResult; -import com.android.ike.eap.EapResult.EapError; -import com.android.ike.eap.EapResult.EapFailure; -import com.android.ike.eap.EapResult.EapResponse; -import com.android.ike.eap.EapResult.EapSuccess; -import com.android.ike.eap.EapSessionConfig; -import com.android.ike.eap.exceptions.EapInvalidRequestException; -import com.android.ike.eap.message.EapMessage; -import com.android.ike.eap.statemachine.EapStateMachine.FailureState; -import com.android.ike.eap.statemachine.EapStateMachine.MethodState; -import com.android.ike.eap.statemachine.EapStateMachine.SuccessState; +import android.net.eap.EapSessionConfig; + +import com.android.internal.net.eap.EapResult; +import com.android.internal.net.eap.EapResult.EapError; +import com.android.internal.net.eap.EapResult.EapFailure; +import com.android.internal.net.eap.EapResult.EapResponse; +import com.android.internal.net.eap.EapResult.EapSuccess; +import com.android.internal.net.eap.exceptions.EapInvalidRequestException; +import com.android.internal.net.eap.message.EapMessage; +import com.android.internal.net.eap.statemachine.EapStateMachine.FailureState; +import com.android.internal.net.eap.statemachine.EapStateMachine.MethodState; +import com.android.internal.net.eap.statemachine.EapStateMachine.SuccessState; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/ChildSessionStateMachineTest.java index 1b6276a6..f6c32eef 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/ChildSessionStateMachineTest.java @@ -14,30 +14,30 @@ * limitations under the License. */ -package com.android.ike.ikev2; +package com.android.internal.net.ipsec.ike; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_INTERNAL_ADDRESS_FAILURE; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_NO_PROPOSAL_CHOSEN; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_TEMPORARY_FAILURE; import static android.system.OsConstants.AF_INET; -import static com.android.ike.ikev2.ChildSessionStateMachine.CMD_FORCE_TRANSITION; -import static com.android.ike.ikev2.IkeSessionStateMachine.CMD_LOCAL_REQUEST_REKEY_CHILD; -import static com.android.ike.ikev2.IkeSessionStateMachine.IKE_EXCHANGE_SUBTYPE_DELETE_CHILD; -import static com.android.ike.ikev2.IkeSessionStateMachine.IKE_EXCHANGE_SUBTYPE_REKEY_CHILD; -import static com.android.ike.ikev2.IkeSessionStateMachine.REKEY_DELETE_TIMEOUT_MS; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_INTERNAL_ADDRESS_FAILURE; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_NO_PROPOSAL_CHOSEN; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_TEMPORARY_FAILURE; -import static com.android.ike.ikev2.message.IkeHeader.EXCHANGE_TYPE_CREATE_CHILD_SA; -import static com.android.ike.ikev2.message.IkeHeader.EXCHANGE_TYPE_INFORMATIONAL; -import static com.android.ike.ikev2.message.IkeNotifyPayload.NOTIFY_TYPE_REKEY_SA; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_CP; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_DELETE; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_KE; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_NONCE; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_NOTIFY; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_SA; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_TS_INITIATOR; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_TS_RESPONDER; -import static com.android.ike.ikev2.message.IkePayload.PROTOCOL_ID_ESP; +import static com.android.internal.net.ipsec.ike.ChildSessionStateMachine.CMD_FORCE_TRANSITION; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.CMD_LOCAL_REQUEST_REKEY_CHILD; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.IKE_EXCHANGE_SUBTYPE_DELETE_CHILD; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.IKE_EXCHANGE_SUBTYPE_REKEY_CHILD; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.REKEY_DELETE_TIMEOUT_MS; +import static com.android.internal.net.ipsec.ike.message.IkeHeader.EXCHANGE_TYPE_CREATE_CHILD_SA; +import static com.android.internal.net.ipsec.ike.message.IkeHeader.EXCHANGE_TYPE_INFORMATIONAL; +import static com.android.internal.net.ipsec.ike.message.IkeNotifyPayload.NOTIFY_TYPE_REKEY_SA; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_CP; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_DELETE; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_KE; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_NONCE; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_NOTIFY; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_SA; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_TS_INITIATOR; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_TS_RESPONDER; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PROTOCOL_ID_ESP; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -68,45 +68,53 @@ import android.net.IpSecManager; import android.net.IpSecManager.UdpEncapsulationSocket; import android.net.IpSecTransform; import android.net.LinkAddress; +import android.net.ipsec.ike.ChildSaProposal; +import android.net.ipsec.ike.ChildSessionCallback; +import android.net.ipsec.ike.ChildSessionConfiguration; +import android.net.ipsec.ike.ChildSessionOptions; +import android.net.ipsec.ike.IkeManager; +import android.net.ipsec.ike.IkeTrafficSelector; +import android.net.ipsec.ike.SaProposal; +import android.net.ipsec.ike.TunnelModeChildSessionOptions; +import android.net.ipsec.ike.exceptions.IkeException; +import android.net.ipsec.ike.exceptions.IkeInternalException; import android.os.test.TestLooper; import androidx.test.InstrumentationRegistry; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.ChildSessionStateMachine.CreateChildSaHelper; -import com.android.ike.ikev2.ChildSessionStateMachine.IChildSessionSmCallback; -import com.android.ike.ikev2.IkeLocalRequestScheduler.ChildLocalRequest; -import com.android.ike.ikev2.SaRecord.ChildSaRecord; -import com.android.ike.ikev2.SaRecord.ChildSaRecordConfig; -import com.android.ike.ikev2.SaRecord.ISaRecordHelper; -import com.android.ike.ikev2.SaRecord.SaRecordHelper; -import com.android.ike.ikev2.crypto.IkeCipher; -import com.android.ike.ikev2.crypto.IkeMacIntegrity; -import com.android.ike.ikev2.crypto.IkeMacPrf; -import com.android.ike.ikev2.exceptions.IkeException; -import com.android.ike.ikev2.exceptions.IkeInternalException; -import com.android.ike.ikev2.exceptions.InvalidKeException; -import com.android.ike.ikev2.exceptions.InvalidSyntaxException; -import com.android.ike.ikev2.exceptions.NoValidProposalChosenException; -import com.android.ike.ikev2.message.IkeConfigPayload; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttribute; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv4Address; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv4Netmask; -import com.android.ike.ikev2.message.IkeDeletePayload; -import com.android.ike.ikev2.message.IkeKePayload; -import com.android.ike.ikev2.message.IkeMessage; -import com.android.ike.ikev2.message.IkeNoncePayload; -import com.android.ike.ikev2.message.IkeNotifyPayload; -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.IntegrityTransform; -import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform; -import com.android.ike.ikev2.message.IkeTestUtils; -import com.android.ike.ikev2.message.IkeTsPayload; -import com.android.ike.ikev2.testutils.MockIpSecTestUtils; -import com.android.ike.utils.Log; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.ChildSessionStateMachine.CreateChildSaHelper; +import com.android.internal.net.ipsec.ike.ChildSessionStateMachine.IChildSessionSmCallback; +import com.android.internal.net.ipsec.ike.IkeLocalRequestScheduler.ChildLocalRequest; +import com.android.internal.net.ipsec.ike.SaRecord.ChildSaRecord; +import com.android.internal.net.ipsec.ike.SaRecord.ChildSaRecordConfig; +import com.android.internal.net.ipsec.ike.SaRecord.ISaRecordHelper; +import com.android.internal.net.ipsec.ike.SaRecord.SaRecordHelper; +import com.android.internal.net.ipsec.ike.crypto.IkeCipher; +import com.android.internal.net.ipsec.ike.crypto.IkeMacIntegrity; +import com.android.internal.net.ipsec.ike.crypto.IkeMacPrf; +import com.android.internal.net.ipsec.ike.exceptions.InvalidKeException; +import com.android.internal.net.ipsec.ike.exceptions.InvalidSyntaxException; +import com.android.internal.net.ipsec.ike.exceptions.NoValidProposalChosenException; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttribute; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv4Address; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv4Netmask; +import com.android.internal.net.ipsec.ike.message.IkeDeletePayload; +import com.android.internal.net.ipsec.ike.message.IkeKePayload; +import com.android.internal.net.ipsec.ike.message.IkeMessage; +import com.android.internal.net.ipsec.ike.message.IkeNoncePayload; +import com.android.internal.net.ipsec.ike.message.IkeNotifyPayload; +import com.android.internal.net.ipsec.ike.message.IkePayload; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.DhGroupTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.EncryptionTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.IntegrityTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.PrfTransform; +import com.android.internal.net.ipsec.ike.message.IkeTestUtils; +import com.android.internal.net.ipsec.ike.message.IkeTsPayload; +import com.android.internal.net.ipsec.ike.testutils.MockIpSecTestUtils; +import com.android.internal.net.utils.Log; import com.android.server.IpSecService; import libcore.net.InetAddressUtils; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeLocalRequestSchedulerTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeLocalRequestSchedulerTest.java index 4b3442e7..3406d014 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeLocalRequestSchedulerTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeLocalRequestSchedulerTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.ike.ikev2; +package com.android.internal.net.ipsec.ike; -import static com.android.ike.ikev2.IkeSessionStateMachine.CMD_LOCAL_REQUEST_REKEY_IKE; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.CMD_LOCAL_REQUEST_REKEY_IKE; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -26,8 +26,8 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import com.android.ike.ikev2.IkeLocalRequestScheduler.IProcedureConsumer; -import com.android.ike.ikev2.IkeLocalRequestScheduler.LocalRequest; +import com.android.internal.net.ipsec.ike.IkeLocalRequestScheduler.IProcedureConsumer; +import com.android.internal.net.ipsec.ike.IkeLocalRequestScheduler.LocalRequest; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionStateMachineTest.java index 74b4003f..94f4d622 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionStateMachineTest.java @@ -14,29 +14,30 @@ * limitations under the License. */ -package com.android.ike.ikev2; - -import static com.android.ike.ikev2.IkeSessionStateMachine.CMD_LOCAL_REQUEST_REKEY_IKE; -import static com.android.ike.ikev2.IkeSessionStateMachine.CMD_RECEIVE_IKE_PACKET; -import static com.android.ike.ikev2.IkeSessionStateMachine.IKE_EXCHANGE_SUBTYPE_DELETE_CHILD; -import static com.android.ike.ikev2.IkeSessionStateMachine.IKE_EXCHANGE_SUBTYPE_REKEY_CHILD; -import static com.android.ike.ikev2.IkeSessionStateMachine.RETRY_INTERVAL_MS; -import static com.android.ike.ikev2.IkeSessionStateMachine.SA_SOFT_LIFETIME_MS; -import static com.android.ike.ikev2.IkeSessionStateMachine.TEMP_FAILURE_RETRY_TIMEOUT_MS; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_CHILD_SA_NOT_FOUND; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_INVALID_SYNTAX; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_NO_ADDITIONAL_SAS; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_NO_PROPOSAL_CHOSEN; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_TEMPORARY_FAILURE; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_UNSUPPORTED_CRITICAL_PAYLOAD; -import static com.android.ike.ikev2.message.IkeHeader.EXCHANGE_TYPE_CREATE_CHILD_SA; -import static com.android.ike.ikev2.message.IkeHeader.EXCHANGE_TYPE_INFORMATIONAL; -import static com.android.ike.ikev2.message.IkeNotifyPayload.NOTIFY_TYPE_IKEV2_FRAGMENTATION_SUPPORTED; -import static com.android.ike.ikev2.message.IkeNotifyPayload.NOTIFY_TYPE_NAT_DETECTION_DESTINATION_IP; -import static com.android.ike.ikev2.message.IkeNotifyPayload.NOTIFY_TYPE_NAT_DETECTION_SOURCE_IP; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_AUTH; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_NOTIFY; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_SA; +package com.android.internal.net.ipsec.ike; + +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_CHILD_SA_NOT_FOUND; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_INVALID_SYNTAX; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_NO_ADDITIONAL_SAS; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_NO_PROPOSAL_CHOSEN; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_TEMPORARY_FAILURE; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_UNSUPPORTED_CRITICAL_PAYLOAD; + +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.CMD_LOCAL_REQUEST_REKEY_IKE; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.CMD_RECEIVE_IKE_PACKET; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.IKE_EXCHANGE_SUBTYPE_DELETE_CHILD; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.IKE_EXCHANGE_SUBTYPE_REKEY_CHILD; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.RETRY_INTERVAL_MS; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.SA_SOFT_LIFETIME_MS; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.TEMP_FAILURE_RETRY_TIMEOUT_MS; +import static com.android.internal.net.ipsec.ike.message.IkeHeader.EXCHANGE_TYPE_CREATE_CHILD_SA; +import static com.android.internal.net.ipsec.ike.message.IkeHeader.EXCHANGE_TYPE_INFORMATIONAL; +import static com.android.internal.net.ipsec.ike.message.IkeNotifyPayload.NOTIFY_TYPE_IKEV2_FRAGMENTATION_SUPPORTED; +import static com.android.internal.net.ipsec.ike.message.IkeNotifyPayload.NOTIFY_TYPE_NAT_DETECTION_DESTINATION_IP; +import static com.android.internal.net.ipsec.ike.message.IkeNotifyPayload.NOTIFY_TYPE_NAT_DETECTION_SOURCE_IP; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_AUTH; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_NOTIFY; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_SA; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -67,68 +68,78 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.IpSecManager; import android.net.IpSecManager.UdpEncapsulationSocket; +import android.net.eap.EapSessionConfig; +import android.net.ipsec.ike.ChildSaProposal; +import android.net.ipsec.ike.ChildSessionCallback; +import android.net.ipsec.ike.ChildSessionOptions; +import android.net.ipsec.ike.IkeIpv4AddrIdentification; +import android.net.ipsec.ike.IkeManager; +import android.net.ipsec.ike.IkeSaProposal; +import android.net.ipsec.ike.IkeSessionCallback; +import android.net.ipsec.ike.IkeSessionOptions; +import android.net.ipsec.ike.SaProposal; +import android.net.ipsec.ike.TransportModeChildSessionOptions; +import android.net.ipsec.ike.exceptions.IkeException; +import android.net.ipsec.ike.exceptions.IkeInternalException; +import android.net.ipsec.ike.exceptions.IkeProtocolException; import android.os.test.TestLooper; import android.telephony.TelephonyManager; -import com.android.ike.TestUtils; -import com.android.ike.eap.EapAuthenticator; -import com.android.ike.eap.EapSessionConfig; -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.IkeLocalRequestScheduler.ChildLocalRequest; -import com.android.ike.ikev2.IkeLocalRequestScheduler.LocalRequest; -import com.android.ike.ikev2.IkeSessionStateMachine.IkeSecurityParameterIndex; -import com.android.ike.ikev2.IkeSessionStateMachine.ReceivedIkePacket; -import com.android.ike.ikev2.SaRecord.ISaRecordHelper; -import com.android.ike.ikev2.SaRecord.IkeSaRecord; -import com.android.ike.ikev2.SaRecord.IkeSaRecordConfig; -import com.android.ike.ikev2.SaRecord.SaRecordHelper; -import com.android.ike.ikev2.crypto.IkeCipher; -import com.android.ike.ikev2.crypto.IkeMacIntegrity; -import com.android.ike.ikev2.crypto.IkeMacPrf; -import com.android.ike.ikev2.exceptions.AuthenticationFailedException; -import com.android.ike.ikev2.exceptions.IkeException; -import com.android.ike.ikev2.exceptions.IkeInternalException; -import com.android.ike.ikev2.exceptions.IkeProtocolException; -import com.android.ike.ikev2.exceptions.InvalidSyntaxException; -import com.android.ike.ikev2.exceptions.NoValidProposalChosenException; -import com.android.ike.ikev2.exceptions.UnsupportedCriticalPayloadException; -import com.android.ike.ikev2.message.IkeAuthDigitalSignPayload; -import com.android.ike.ikev2.message.IkeAuthPayload; -import com.android.ike.ikev2.message.IkeAuthPskPayload; -import com.android.ike.ikev2.message.IkeCertX509CertPayload; -import com.android.ike.ikev2.message.IkeDeletePayload; -import com.android.ike.ikev2.message.IkeEapPayload; -import com.android.ike.ikev2.message.IkeHeader; -import com.android.ike.ikev2.message.IkeIdPayload; -import com.android.ike.ikev2.message.IkeInformationalPayload; -import com.android.ike.ikev2.message.IkeKePayload; -import com.android.ike.ikev2.message.IkeMessage; -import com.android.ike.ikev2.message.IkeMessage.DecodeResult; -import com.android.ike.ikev2.message.IkeMessage.DecodeResultOk; -import com.android.ike.ikev2.message.IkeMessage.DecodeResultPartial; -import com.android.ike.ikev2.message.IkeMessage.DecodeResultProtectedError; -import com.android.ike.ikev2.message.IkeMessage.DecodeResultUnprotectedError; -import com.android.ike.ikev2.message.IkeMessage.IIkeMessageHelper; -import com.android.ike.ikev2.message.IkeMessage.IkeMessageHelper; -import com.android.ike.ikev2.message.IkeNoncePayload; -import com.android.ike.ikev2.message.IkeNotifyPayload; -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.IntegrityTransform; -import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform; -import com.android.ike.ikev2.message.IkeSkfPayload; -import com.android.ike.ikev2.message.IkeTestUtils; -import com.android.ike.ikev2.message.IkeTsPayload; -import com.android.ike.ikev2.testutils.CertUtils; -import com.android.ike.ikev2.testutils.MockIpSecTestUtils; -import com.android.ike.ikev2.utils.Retransmitter; -import com.android.ike.ikev2.utils.Retransmitter.IBackoffTimeoutCalculator; -import com.android.ike.utils.Log; +import com.android.internal.net.TestUtils; +import com.android.internal.net.eap.EapAuthenticator; +import com.android.internal.net.eap.IEapCallback; +import com.android.internal.net.ipsec.ike.ChildSessionStateMachine.IChildSessionSmCallback; +import com.android.internal.net.ipsec.ike.ChildSessionStateMachineFactory.ChildSessionFactoryHelper; +import com.android.internal.net.ipsec.ike.ChildSessionStateMachineFactory.IChildSessionFactoryHelper; +import com.android.internal.net.ipsec.ike.IkeLocalRequestScheduler.ChildLocalRequest; +import com.android.internal.net.ipsec.ike.IkeLocalRequestScheduler.LocalRequest; +import com.android.internal.net.ipsec.ike.IkeSessionStateMachine.IkeSecurityParameterIndex; +import com.android.internal.net.ipsec.ike.IkeSessionStateMachine.ReceivedIkePacket; +import com.android.internal.net.ipsec.ike.SaRecord.ISaRecordHelper; +import com.android.internal.net.ipsec.ike.SaRecord.IkeSaRecord; +import com.android.internal.net.ipsec.ike.SaRecord.IkeSaRecordConfig; +import com.android.internal.net.ipsec.ike.SaRecord.SaRecordHelper; +import com.android.internal.net.ipsec.ike.crypto.IkeCipher; +import com.android.internal.net.ipsec.ike.crypto.IkeMacIntegrity; +import com.android.internal.net.ipsec.ike.crypto.IkeMacPrf; +import com.android.internal.net.ipsec.ike.exceptions.AuthenticationFailedException; +import com.android.internal.net.ipsec.ike.exceptions.InvalidSyntaxException; +import com.android.internal.net.ipsec.ike.exceptions.NoValidProposalChosenException; +import com.android.internal.net.ipsec.ike.exceptions.UnsupportedCriticalPayloadException; +import com.android.internal.net.ipsec.ike.message.IkeAuthDigitalSignPayload; +import com.android.internal.net.ipsec.ike.message.IkeAuthPayload; +import com.android.internal.net.ipsec.ike.message.IkeAuthPskPayload; +import com.android.internal.net.ipsec.ike.message.IkeCertX509CertPayload; +import com.android.internal.net.ipsec.ike.message.IkeDeletePayload; +import com.android.internal.net.ipsec.ike.message.IkeEapPayload; +import com.android.internal.net.ipsec.ike.message.IkeHeader; +import com.android.internal.net.ipsec.ike.message.IkeIdPayload; +import com.android.internal.net.ipsec.ike.message.IkeInformationalPayload; +import com.android.internal.net.ipsec.ike.message.IkeKePayload; +import com.android.internal.net.ipsec.ike.message.IkeMessage; +import com.android.internal.net.ipsec.ike.message.IkeMessage.DecodeResult; +import com.android.internal.net.ipsec.ike.message.IkeMessage.DecodeResultOk; +import com.android.internal.net.ipsec.ike.message.IkeMessage.DecodeResultPartial; +import com.android.internal.net.ipsec.ike.message.IkeMessage.DecodeResultProtectedError; +import com.android.internal.net.ipsec.ike.message.IkeMessage.DecodeResultUnprotectedError; +import com.android.internal.net.ipsec.ike.message.IkeMessage.IIkeMessageHelper; +import com.android.internal.net.ipsec.ike.message.IkeMessage.IkeMessageHelper; +import com.android.internal.net.ipsec.ike.message.IkeNoncePayload; +import com.android.internal.net.ipsec.ike.message.IkeNotifyPayload; +import com.android.internal.net.ipsec.ike.message.IkePayload; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.DhGroupTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.EncryptionTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.IntegrityTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.PrfTransform; +import com.android.internal.net.ipsec.ike.message.IkeSkfPayload; +import com.android.internal.net.ipsec.ike.message.IkeTestUtils; +import com.android.internal.net.ipsec.ike.message.IkeTsPayload; +import com.android.internal.net.ipsec.ike.testutils.CertUtils; +import com.android.internal.net.ipsec.ike.testutils.MockIpSecTestUtils; +import com.android.internal.net.ipsec.ike.utils.Retransmitter; +import com.android.internal.net.ipsec.ike.utils.Retransmitter.IBackoffTimeoutCalculator; +import com.android.internal.net.utils.Log; import com.android.internal.util.State; import libcore.net.InetAddressUtils; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSocketTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSocketTest.java index 11db7df4..1b8761f7 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSocketTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSocketTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2; +package com.android.internal.net.ipsec.ike; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -39,9 +39,9 @@ import android.util.LongSparseArray; import androidx.test.InstrumentationRegistry; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.IkeSocket.PacketReceiver; -import com.android.ike.ikev2.message.IkeHeader; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.IkeSocket.PacketReceiver; +import com.android.internal.net.ipsec.ike.message.IkeHeader; import org.junit.After; import org.junit.Before; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/SaRecordTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/SaRecordTest.java index e3a69554..646b9d9a 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/SaRecordTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/SaRecordTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2; +package com.android.internal.net.ipsec.ike; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -32,26 +32,27 @@ import android.net.IpSecManager; import android.net.IpSecManager.SecurityParameterIndex; import android.net.IpSecManager.UdpEncapsulationSocket; import android.net.IpSecTransform; - -import com.android.ike.TestUtils; -import com.android.ike.ikev2.IkeLocalRequestScheduler.ChildLocalRequest; -import com.android.ike.ikev2.IkeLocalRequestScheduler.LocalRequest; -import com.android.ike.ikev2.IkeSessionStateMachine.IkeSecurityParameterIndex; -import com.android.ike.ikev2.SaRecord.ChildSaRecord; -import com.android.ike.ikev2.SaRecord.ChildSaRecordConfig; -import com.android.ike.ikev2.SaRecord.IIpSecTransformHelper; -import com.android.ike.ikev2.SaRecord.IkeSaRecord; -import com.android.ike.ikev2.SaRecord.IkeSaRecordConfig; -import com.android.ike.ikev2.SaRecord.IpSecTransformHelper; -import com.android.ike.ikev2.SaRecord.SaRecordHelper; -import com.android.ike.ikev2.crypto.IkeCipher; -import com.android.ike.ikev2.crypto.IkeMacIntegrity; -import com.android.ike.ikev2.crypto.IkeMacPrf; -import com.android.ike.ikev2.message.IkeMessage; -import com.android.ike.ikev2.message.IkeSaPayload.EncryptionTransform; -import com.android.ike.ikev2.message.IkeSaPayload.IntegrityTransform; -import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform; -import com.android.ike.ikev2.testutils.MockIpSecTestUtils; +import android.net.ipsec.ike.SaProposal; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.IkeLocalRequestScheduler.ChildLocalRequest; +import com.android.internal.net.ipsec.ike.IkeLocalRequestScheduler.LocalRequest; +import com.android.internal.net.ipsec.ike.IkeSessionStateMachine.IkeSecurityParameterIndex; +import com.android.internal.net.ipsec.ike.SaRecord.ChildSaRecord; +import com.android.internal.net.ipsec.ike.SaRecord.ChildSaRecordConfig; +import com.android.internal.net.ipsec.ike.SaRecord.IIpSecTransformHelper; +import com.android.internal.net.ipsec.ike.SaRecord.IkeSaRecord; +import com.android.internal.net.ipsec.ike.SaRecord.IkeSaRecordConfig; +import com.android.internal.net.ipsec.ike.SaRecord.IpSecTransformHelper; +import com.android.internal.net.ipsec.ike.SaRecord.SaRecordHelper; +import com.android.internal.net.ipsec.ike.crypto.IkeCipher; +import com.android.internal.net.ipsec.ike.crypto.IkeMacIntegrity; +import com.android.internal.net.ipsec.ike.crypto.IkeMacPrf; +import com.android.internal.net.ipsec.ike.message.IkeMessage; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.EncryptionTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.IntegrityTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.PrfTransform; +import com.android.internal.net.ipsec.ike.testutils.MockIpSecTestUtils; import com.android.server.IpSecService; import libcore.net.InetAddressUtils; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeCombinedModeCipherTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeCombinedModeCipherTest.java index a7ff2990..a3b2253e 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeCombinedModeCipherTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeCombinedModeCipherTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2.crypto; +package com.android.internal.net.ipsec.ike.crypto; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -23,11 +23,11 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.net.IpSecAlgorithm; +import android.net.ipsec.ike.SaProposal; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.message.IkeMessage; -import com.android.ike.ikev2.message.IkeSaPayload.EncryptionTransform; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.message.IkeMessage; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.EncryptionTransform; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeMacIntegrityTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeMacIntegrityTest.java index d3c857c9..ed625660 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeMacIntegrityTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeMacIntegrityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2.crypto; +package com.android.internal.net.ipsec.ike.crypto; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse; @@ -22,11 +22,11 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.net.IpSecAlgorithm; +import android.net.ipsec.ike.SaProposal; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.message.IkeMessage; -import com.android.ike.ikev2.message.IkeSaPayload.IntegrityTransform; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.message.IkeMessage; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.IntegrityTransform; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeMacPrfTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeMacPrfTest.java index 0de72fac..717886f7 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeMacPrfTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeMacPrfTest.java @@ -14,15 +14,16 @@ * limitations under the License. */ -package com.android.ike.ikev2.crypto; +package com.android.internal.net.ipsec.ike.crypto; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.message.IkeMessage; -import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform; +import android.net.ipsec.ike.SaProposal; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.message.IkeMessage; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.PrfTransform; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeNormalModeCipherTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeNormalModeCipherTest.java index 8119d7a3..3f3a0e10 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/crypto/IkeNormalModeCipherTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/crypto/IkeNormalModeCipherTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2.crypto; +package com.android.internal.net.ipsec.ike.crypto; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -23,11 +23,11 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.net.IpSecAlgorithm; +import android.net.ipsec.ike.SaProposal; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.message.IkeMessage; -import com.android.ike.ikev2.message.IkeSaPayload.EncryptionTransform; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.message.IkeMessage; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.EncryptionTransform; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeAuthDigitalSignPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeAuthDigitalSignPayloadTest.java index 239bd504..96921c30 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeAuthDigitalSignPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeAuthDigitalSignPayloadTest.java @@ -14,21 +14,22 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; -import static com.android.ike.ikev2.message.IkeAuthDigitalSignPayload.SIGNATURE_ALGO_RSA_SHA2_256; +import static com.android.internal.net.ipsec.ike.message.IkeAuthDigitalSignPayload.SIGNATURE_ALGO_RSA_SHA2_256; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.crypto.IkeMacPrf; -import com.android.ike.ikev2.exceptions.AuthenticationFailedException; -import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform; -import com.android.ike.ikev2.testutils.CertUtils; +import android.net.ipsec.ike.SaProposal; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.crypto.IkeMacPrf; +import com.android.internal.net.ipsec.ike.exceptions.AuthenticationFailedException; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.PrfTransform; +import com.android.internal.net.ipsec.ike.testutils.CertUtils; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeAuthPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeAuthPayloadTest.java index f2de2607..989b4689 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeAuthPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeAuthPayloadTest.java @@ -14,18 +14,19 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.crypto.IkeMacPrf; -import com.android.ike.ikev2.exceptions.AuthenticationFailedException; -import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform; +import android.net.ipsec.ike.SaProposal; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.crypto.IkeMacPrf; +import com.android.internal.net.ipsec.ike.exceptions.AuthenticationFailedException; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.PrfTransform; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeAuthPskPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeAuthPskPayloadTest.java index d514b69e..cad60522 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeAuthPskPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeAuthPskPayloadTest.java @@ -14,17 +14,18 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.crypto.IkeMacPrf; -import com.android.ike.ikev2.exceptions.AuthenticationFailedException; -import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform; +import android.net.ipsec.ike.SaProposal; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.crypto.IkeMacPrf; +import com.android.internal.net.ipsec.ike.exceptions.AuthenticationFailedException; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.PrfTransform; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeCertPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeCertPayloadTest.java index 1b641fcf..2bb72e33 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeCertPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeCertPayloadTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; import static org.junit.Assert.fail; -import com.android.ike.ikev2.exceptions.AuthenticationFailedException; -import com.android.ike.ikev2.testutils.CertUtils; +import com.android.internal.net.ipsec.ike.exceptions.AuthenticationFailedException; +import com.android.internal.net.ipsec.ike.testutils.CertUtils; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeCertX509CertPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeCertX509CertPayloadTest.java index 8cabaebc..ef6ec289 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeCertX509CertPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeCertX509CertPayloadTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.exceptions.AuthenticationFailedException; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.exceptions.AuthenticationFailedException; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeConfigPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeConfigPayloadTest.java index e8a67d79..9fc32229 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeConfigPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeConfigPayloadTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; - -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_ADDRESS; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_DHCP; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_DNS; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_NETMASK; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_SUBNET; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_ADDRESS; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_DNS; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_SUBNET; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_TYPE_REPLY; -import static com.android.ike.ikev2.message.IkeConfigPayload.CONFIG_TYPE_REQUEST; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_CP; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_NOTIFY; +package com.android.internal.net.ipsec.ike.message; + +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_ADDRESS; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_DHCP; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_DNS; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_NETMASK; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP4_SUBNET; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_ADDRESS; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_DNS; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_ATTR_INTERNAL_IP6_SUBNET; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_TYPE_REPLY; +import static com.android.internal.net.ipsec.ike.message.IkeConfigPayload.CONFIG_TYPE_REQUEST; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_CP; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_NOTIFY; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -42,19 +42,19 @@ import static org.mockito.Mockito.when; import android.net.LinkAddress; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.exceptions.InvalidSyntaxException; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttrIpv4AddressBase; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttrIpv6AddrRangeBase; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttribute; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv4Address; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv4Dhcp; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv4Dns; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv4Netmask; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv4Subnet; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv6Address; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv6Dns; -import com.android.ike.ikev2.message.IkeConfigPayload.ConfigAttributeIpv6Subnet; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.exceptions.InvalidSyntaxException; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttrIpv4AddressBase; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttrIpv6AddrRangeBase; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttribute; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv4Address; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv4Dhcp; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv4Dns; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv4Netmask; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv4Subnet; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv6Address; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv6Dns; +import com.android.internal.net.ipsec.ike.message.IkeConfigPayload.ConfigAttributeIpv6Subnet; import libcore.net.InetAddressUtils; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeDeletePayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeDeletePayloadTest.java index ddd1aa9d..6be5336f 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeDeletePayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeDeletePayloadTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; -import static com.android.ike.ikev2.message.IkePayload.PROTOCOL_ID_ESP; -import static com.android.ike.ikev2.message.IkePayload.PROTOCOL_ID_IKE; -import static com.android.ike.ikev2.message.IkePayload.SPI_LEN_IPSEC; -import static com.android.ike.ikev2.message.IkePayload.SPI_LEN_NOT_INCLUDED; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PROTOCOL_ID_ESP; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PROTOCOL_ID_IKE; +import static com.android.internal.net.ipsec.ike.message.IkePayload.SPI_LEN_IPSEC; +import static com.android.internal.net.ipsec.ike.message.IkePayload.SPI_LEN_NOT_INCLUDED; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.exceptions.InvalidSyntaxException; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.exceptions.InvalidSyntaxException; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeEapPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeEapPayloadTest.java index df89ce09..fff82b60 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeEapPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeEapPayloadTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; -import static com.android.ike.TestUtils.hexStringToByteArray; +import static com.android.internal.net.TestUtils.hexStringToByteArray; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeEncryptedPayloadBodyTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeEncryptedPayloadBodyTest.java index c43a8594..36c7648a 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeEncryptedPayloadBodyTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeEncryptedPayloadBodyTest.java @@ -13,20 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.crypto.IkeCipher; -import com.android.ike.ikev2.crypto.IkeCombinedModeCipher; -import com.android.ike.ikev2.crypto.IkeMacIntegrity; -import com.android.ike.ikev2.crypto.IkeNormalModeCipher; -import com.android.ike.ikev2.message.IkeSaPayload.EncryptionTransform; -import com.android.ike.ikev2.message.IkeSaPayload.IntegrityTransform; +import android.net.ipsec.ike.SaProposal; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.crypto.IkeCipher; +import com.android.internal.net.ipsec.ike.crypto.IkeCombinedModeCipher; +import com.android.internal.net.ipsec.ike.crypto.IkeMacIntegrity; +import com.android.internal.net.ipsec.ike.crypto.IkeNormalModeCipher; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.EncryptionTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.IntegrityTransform; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeHeaderTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeHeaderTest.java index f3c7a2be..4592815d 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeHeaderTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeHeaderTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; 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 com.android.ike.TestUtils; -import com.android.ike.ikev2.exceptions.InvalidMajorVersionException; -import com.android.ike.ikev2.exceptions.InvalidSyntaxException; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.exceptions.InvalidMajorVersionException; +import com.android.internal.net.ipsec.ike.exceptions.InvalidSyntaxException; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeIdPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeIdPayloadTest.java index 14d05264..75552b31 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeIdPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeIdPayloadTest.java @@ -14,20 +14,21 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; import static org.junit.Assert.assertArrayEquals; 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.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 android.net.ipsec.ike.IkeFqdnIdentification; +import android.net.ipsec.ike.IkeIdentification; +import android.net.ipsec.ike.IkeIpv4AddrIdentification; +import android.net.ipsec.ike.IkeIpv6AddrIdentification; +import android.net.ipsec.ike.IkeKeyIdIdentification; +import android.net.ipsec.ike.IkeRfc822AddrIdentification; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.exceptions.AuthenticationFailedException; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeKePayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeKePayloadTest.java index b1887bdd..f5046dca 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeKePayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeKePayloadTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -22,11 +22,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.IkeDhParams; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.exceptions.InvalidSyntaxException; -import com.android.ike.utils.BigIntegerUtils; +import android.net.ipsec.ike.SaProposal; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.IkeDhParams; +import com.android.internal.net.ipsec.ike.exceptions.InvalidSyntaxException; +import com.android.internal.net.utils.BigIntegerUtils; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeMessageTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeMessageTest.java index e9994556..38b41527 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeMessageTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeMessageTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; -import static com.android.ike.ikev2.message.IkeMessage.DECODE_STATUS_OK; -import static com.android.ike.ikev2.message.IkeMessage.DECODE_STATUS_PROTECTED_ERROR; -import static com.android.ike.ikev2.message.IkeMessage.DECODE_STATUS_UNPROTECTED_ERROR; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_AUTH; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_ID_INITIATOR; -import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_NO_NEXT; -import static com.android.ike.ikev2.message.IkeTestUtils.makeDummySkfPayload; +import static com.android.internal.net.ipsec.ike.message.IkeMessage.DECODE_STATUS_OK; +import static com.android.internal.net.ipsec.ike.message.IkeMessage.DECODE_STATUS_PROTECTED_ERROR; +import static com.android.internal.net.ipsec.ike.message.IkeMessage.DECODE_STATUS_UNPROTECTED_ERROR; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_AUTH; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_ID_INITIATOR; +import static com.android.internal.net.ipsec.ike.message.IkePayload.PAYLOAD_TYPE_NO_NEXT; +import static com.android.internal.net.ipsec.ike.message.IkeTestUtils.makeDummySkfPayload; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -44,20 +44,21 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaRecord.IkeSaRecord; -import com.android.ike.ikev2.crypto.IkeMacIntegrity; -import com.android.ike.ikev2.crypto.IkeNormalModeCipher; -import com.android.ike.ikev2.exceptions.IkeException; -import com.android.ike.ikev2.exceptions.IkeInternalException; -import com.android.ike.ikev2.exceptions.InvalidMessageIdException; -import com.android.ike.ikev2.exceptions.InvalidSyntaxException; -import com.android.ike.ikev2.exceptions.UnsupportedCriticalPayloadException; -import com.android.ike.ikev2.message.IkeMessage.DecodeResult; -import com.android.ike.ikev2.message.IkeMessage.DecodeResultError; -import com.android.ike.ikev2.message.IkeMessage.DecodeResultOk; -import com.android.ike.ikev2.message.IkeMessage.DecodeResultPartial; -import com.android.ike.ikev2.message.IkePayloadFactory.IIkePayloadDecoder; +import android.net.ipsec.ike.exceptions.IkeException; +import android.net.ipsec.ike.exceptions.IkeInternalException; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.SaRecord.IkeSaRecord; +import com.android.internal.net.ipsec.ike.crypto.IkeMacIntegrity; +import com.android.internal.net.ipsec.ike.crypto.IkeNormalModeCipher; +import com.android.internal.net.ipsec.ike.exceptions.InvalidMessageIdException; +import com.android.internal.net.ipsec.ike.exceptions.InvalidSyntaxException; +import com.android.internal.net.ipsec.ike.exceptions.UnsupportedCriticalPayloadException; +import com.android.internal.net.ipsec.ike.message.IkeMessage.DecodeResult; +import com.android.internal.net.ipsec.ike.message.IkeMessage.DecodeResultError; +import com.android.internal.net.ipsec.ike.message.IkeMessage.DecodeResultOk; +import com.android.internal.net.ipsec.ike.message.IkeMessage.DecodeResultPartial; +import com.android.internal.net.ipsec.ike.message.IkePayloadFactory.IIkePayloadDecoder; import org.junit.After; import org.junit.Before; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeNoncePayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeNoncePayloadTest.java index 1c3d193e..dd92a45e 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeNoncePayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeNoncePayloadTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; import static org.junit.Assert.assertArrayEquals; -import com.android.ike.TestUtils; +import com.android.internal.net.TestUtils; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeNotifyPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeNotifyPayloadTest.java index 99ce6b99..884c76eb 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeNotifyPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeNotifyPayloadTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_AUTHENTICATION_FAILED; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_INVALID_KE_PAYLOAD; -import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_UNSUPPORTED_CRITICAL_PAYLOAD; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_AUTHENTICATION_FAILED; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_INVALID_KE_PAYLOAD; +import static android.net.ipsec.ike.exceptions.IkeProtocolException.ERROR_TYPE_UNSUPPORTED_CRITICAL_PAYLOAD; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -26,13 +26,14 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.exceptions.AuthenticationFailedException; -import com.android.ike.ikev2.exceptions.IkeProtocolException; -import com.android.ike.ikev2.exceptions.InvalidKeException; -import com.android.ike.ikev2.exceptions.InvalidSyntaxException; -import com.android.ike.ikev2.exceptions.UnrecognizedIkeProtocolException; +import android.net.ipsec.ike.SaProposal; +import android.net.ipsec.ike.exceptions.IkeProtocolException; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.exceptions.AuthenticationFailedException; +import com.android.internal.net.ipsec.ike.exceptions.InvalidKeException; +import com.android.internal.net.ipsec.ike.exceptions.InvalidSyntaxException; +import com.android.internal.net.ipsec.ike.exceptions.UnrecognizedIkeProtocolException; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSaPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSaPayloadTest.java index 7a6bd4c7..750ff463 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSaPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSaPayloadTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -33,31 +33,31 @@ import static org.mockito.Mockito.when; import android.net.IpSecManager; import android.net.IpSecSpiResponse; +import android.net.ipsec.ike.ChildSaProposal; +import android.net.ipsec.ike.IkeSaProposal; +import android.net.ipsec.ike.SaProposal; +import android.net.ipsec.ike.exceptions.IkeProtocolException; 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; -import com.android.ike.ikev2.exceptions.NoValidProposalChosenException; -import com.android.ike.ikev2.message.IkeSaPayload.Attribute; -import com.android.ike.ikev2.message.IkeSaPayload.AttributeDecoder; -import com.android.ike.ikev2.message.IkeSaPayload.ChildProposal; -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.IkeProposal; -import com.android.ike.ikev2.message.IkeSaPayload.IntegrityTransform; -import com.android.ike.ikev2.message.IkeSaPayload.KeyLengthAttribute; -import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform; -import com.android.ike.ikev2.message.IkeSaPayload.Proposal; -import com.android.ike.ikev2.message.IkeSaPayload.Transform; -import com.android.ike.ikev2.message.IkeSaPayload.TransformDecoder; -import com.android.ike.ikev2.message.IkeSaPayload.UnrecognizedAttribute; -import com.android.ike.ikev2.message.IkeSaPayload.UnrecognizedTransform; -import com.android.ike.ikev2.testutils.MockIpSecTestUtils; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.exceptions.InvalidSyntaxException; +import com.android.internal.net.ipsec.ike.exceptions.NoValidProposalChosenException; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.Attribute; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.AttributeDecoder; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.ChildProposal; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.DhGroupTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.EncryptionTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.EsnTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.IkeProposal; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.IntegrityTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.KeyLengthAttribute; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.PrfTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.Proposal; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.Transform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.TransformDecoder; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.UnrecognizedAttribute; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.UnrecognizedTransform; +import com.android.internal.net.ipsec.ike.testutils.MockIpSecTestUtils; import com.android.server.IpSecService; import libcore.net.InetAddressUtils; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSkPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSkPayloadTest.java index f3af5b65..898db30f 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSkPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSkPayloadTest.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; import static org.junit.Assert.assertArrayEquals; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.crypto.IkeCipher; -import com.android.ike.ikev2.crypto.IkeMacIntegrity; -import com.android.ike.ikev2.message.IkeSaPayload.EncryptionTransform; -import com.android.ike.ikev2.message.IkeSaPayload.IntegrityTransform; +import android.net.ipsec.ike.SaProposal; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.crypto.IkeCipher; +import com.android.internal.net.ipsec.ike.crypto.IkeMacIntegrity; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.EncryptionTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.IntegrityTransform; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSkfPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSkfPayloadTest.java index f51d1e60..3374a7dc 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSkfPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSkfPayloadTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -23,14 +23,15 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.SaProposal; -import com.android.ike.ikev2.crypto.IkeCipher; -import com.android.ike.ikev2.crypto.IkeMacIntegrity; -import com.android.ike.ikev2.crypto.IkeNormalModeCipher; -import com.android.ike.ikev2.exceptions.InvalidSyntaxException; -import com.android.ike.ikev2.message.IkeSaPayload.EncryptionTransform; -import com.android.ike.ikev2.message.IkeSaPayload.IntegrityTransform; +import android.net.ipsec.ike.SaProposal; + +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.crypto.IkeCipher; +import com.android.internal.net.ipsec.ike.crypto.IkeMacIntegrity; +import com.android.internal.net.ipsec.ike.crypto.IkeNormalModeCipher; +import com.android.internal.net.ipsec.ike.exceptions.InvalidSyntaxException; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.EncryptionTransform; +import com.android.internal.net.ipsec.ike.message.IkeSaPayload.IntegrityTransform; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeTestUtils.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeTestUtils.java index a87f8ad4..05474379 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeTestUtils.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeTestUtils.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; -import static com.android.ike.ikev2.message.IkeMessage.DECODE_STATUS_UNPROTECTED_ERROR; +import static com.android.internal.net.ipsec.ike.message.IkeMessage.DECODE_STATUS_UNPROTECTED_ERROR; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -24,12 +24,12 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import android.net.ipsec.ike.exceptions.IkeProtocolException; import android.util.Pair; -import com.android.ike.TestUtils; -import com.android.ike.ikev2.exceptions.IkeProtocolException; -import com.android.ike.ikev2.message.IkeMessage.DecodeResult; -import com.android.ike.ikev2.message.IkeMessage.DecodeResultError; +import com.android.internal.net.TestUtils; +import com.android.internal.net.ipsec.ike.message.IkeMessage.DecodeResult; +import com.android.internal.net.ipsec.ike.message.IkeMessage.DecodeResultError; import java.nio.ByteBuffer; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeTsPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeTsPayloadTest.java index 1e455917..cbd6f930 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeTsPayloadTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeTsPayloadTest.java @@ -14,15 +14,16 @@ * limitations under the License. */ -package com.android.ike.ikev2.message; +package com.android.internal.net.ipsec.ike.message; 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 com.android.ike.TestUtils; -import com.android.ike.ikev2.IkeTrafficSelector; +import android.net.ipsec.ike.IkeTrafficSelector; + +import com.android.internal.net.TestUtils; import libcore.net.InetAddressUtils; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/testutils/CertUtils.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/testutils/CertUtils.java index e42e5647..db128c80 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/testutils/CertUtils.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/testutils/CertUtils.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.ike.ikev2.testutils; +package com.android.internal.net.ipsec.ike.testutils; import android.content.Context; import androidx.test.InstrumentationRegistry; -import com.android.ike.ikev2.message.IkeMessage; +import com.android.internal.net.ipsec.ike.message.IkeMessage; import com.android.org.bouncycastle.util.io.pem.PemObject; import com.android.org.bouncycastle.util.io.pem.PemReader; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/testutils/MockIpSecTestUtils.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/testutils/MockIpSecTestUtils.java index 9659f5e4..742ff240 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/testutils/MockIpSecTestUtils.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/testutils/MockIpSecTestUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.ikev2.testutils; +package com.android.internal.net.ipsec.ike.testutils; import static android.system.OsConstants.AF_INET; import static android.system.OsConstants.IPPROTO_UDP; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/utils/RetransmitterTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/utils/RetransmitterTest.java index b1d4ea56..1fddb1d9 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/utils/RetransmitterTest.java +++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/utils/RetransmitterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.ike.ikev2.utils; +package com.android.internal.net.ipsec.ike.utils; -import static com.android.ike.ikev2.IkeSessionStateMachine.CMD_RETRANSMIT; +import static com.android.internal.net.ipsec.ike.IkeSessionStateMachine.CMD_RETRANSMIT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,7 +33,7 @@ import static org.mockito.Mockito.when; import android.os.Handler; import android.os.Message; -import com.android.ike.ikev2.message.IkeMessage; +import com.android.internal.net.ipsec.ike.message.IkeMessage; import org.junit.Before; import org.junit.Test; diff --git a/tests/iketests/src/java/com/android/ike/utils/BigIntegerUtilsTest.java b/tests/iketests/src/java/com/android/internal/net/utils/BigIntegerUtilsTest.java index a9babaef..29bb313d 100644 --- a/tests/iketests/src/java/com/android/ike/utils/BigIntegerUtilsTest.java +++ b/tests/iketests/src/java/com/android/internal/net/utils/BigIntegerUtilsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.utils; +package com.android.internal.net.utils; import static org.junit.Assert.assertArrayEquals; diff --git a/tests/iketests/src/java/com/android/ike/utils/LogTest.java b/tests/iketests/src/java/com/android/internal/net/utils/LogTest.java index 9536e00b..23305aa7 100644 --- a/tests/iketests/src/java/com/android/ike/utils/LogTest.java +++ b/tests/iketests/src/java/com/android/internal/net/utils/LogTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.utils; +package com.android.internal.net.utils; import static org.junit.Assert.assertEquals; diff --git a/tests/iketests/src/java/com/android/ike/utils/SimpleStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/utils/SimpleStateMachineTest.java index b2ea9141..2ee8dc53 100644 --- a/tests/iketests/src/java/com/android/ike/utils/SimpleStateMachineTest.java +++ b/tests/iketests/src/java/com/android/internal/net/utils/SimpleStateMachineTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ike.utils; +package com.android.internal.net.utils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -22,7 +22,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.android.ike.utils.SimpleStateMachine.SimpleState; +import com.android.internal.net.utils.SimpleStateMachine.SimpleState; import org.junit.Before; import org.junit.Test; |