diff options
| author | Cody Kesting <ckesting@google.com> | 2019-10-31 09:55:00 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-31 09:55:00 -0700 |
| commit | cc3b07d680b429592dcdd82bb9c0c9bdd1fcee09 (patch) | |
| tree | f99145ff3f4ebec7194b08f82b96dfdbc71d3635 | |
| parent | 8c0c0644902af46e3f2d5223dcb4b660df4d686f (diff) | |
| parent | be6b5d92358a99d90baec7e617ed1ace60b32a3d (diff) | |
| download | ike-cc3b07d680b429592dcdd82bb9c0c9bdd1fcee09.tar.gz | |
Allow MAC algorithm overriding for EAP-SIM/AKA.
am: be6b5d9235
Change-Id: I86cfcddb172065913adb41db3e84d99074e01395
| -rw-r--r-- | src/java/com/android/ike/eap/statemachine/EapSimAkaMethodStateMachine.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/java/com/android/ike/eap/statemachine/EapSimAkaMethodStateMachine.java b/src/java/com/android/ike/eap/statemachine/EapSimAkaMethodStateMachine.java index 2b4cf7e1..65fcea61 100644 --- a/src/java/com/android/ike/eap/statemachine/EapSimAkaMethodStateMachine.java +++ b/src/java/com/android/ike/eap/statemachine/EapSimAkaMethodStateMachine.java @@ -127,6 +127,10 @@ public abstract class EapSimAkaMethodStateMachine extends EapMethodStateMachine return EapStateMachine.handleNotification(tag, message); } + protected String getMacAlgorithm() { + return MAC_ALGORITHM_STRING; + } + @VisibleForTesting EapResult buildClientErrorResponse( int eapIdentifier, @@ -206,8 +210,8 @@ public abstract class EapSimAkaMethodStateMachine extends EapMethodStateMachine boolean isValidMac(String tag, EapMessage message, EapSimAkaTypeData typeData, byte[] extraData) throws GeneralSecurityException, EapSimAkaInvalidAttributeException, EapSilentException { - mMacAlgorithm = Mac.getInstance(MAC_ALGORITHM_STRING); - mMacAlgorithm.init(new SecretKeySpec(mKAut, MAC_ALGORITHM_STRING)); + mMacAlgorithm = Mac.getInstance(getMacAlgorithm()); + mMacAlgorithm.init(new SecretKeySpec(mKAut, getMacAlgorithm())); byte[] mac = getMac(message.eapCode, message.eapIdentifier, typeData, extraData); // attributes are 'valid', so must have AtMac |