diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-08-30 00:50:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-30 00:50:36 +0000 |
| commit | 0889977be8a4d42a4d5e67cf6f7c000dd7404d50 (patch) | |
| tree | 26458f058ebddb8510c3c022b83280b464e43dfb | |
| parent | 5bd95d43baf1c917ed744cf4da79e3ef938c54d3 (diff) | |
| parent | 750765078ffe4a6cf5f30f015e48582a12857ef3 (diff) | |
| download | libese-0889977be8a4d42a4d5e67cf6f7c000dd7404d50.tar.gz | |
Merge "Return appropriate error when an invalid timestamptoken is provided." into main am: 49876d0ead am: f5b5ce6978 am: 750765078f
Original change: https://android-review.googlesource.com/c/platform/external/libese/+/2663756
Change-Id: I12f6c64dfc955e32b37c3249e29432aa90a895f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java b/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java index 04fadea..138e505 100644 --- a/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java +++ b/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java @@ -2991,12 +2991,12 @@ public class KMKeymasterApplet extends Applet implements AppletEvent, ExtendedLe // validate operation handle. short ptr = KMVerificationToken.cast(data[VERIFICATION_TOKEN]).getChallenge(); if (KMInteger.compare(ptr, op.getHandle()) != 0) { - KMException.throwIt(KMError.VERIFICATION_FAILED); + KMException.throwIt(KMError.KEY_USER_NOT_AUTHENTICATED); } tmpVariables[0] = op.getAuthTime(); tmpVariables[2] = KMVerificationToken.cast(data[VERIFICATION_TOKEN]).getTimestamp(); if (tmpVariables[2] == KMType.INVALID_VALUE) { - KMException.throwIt(KMError.VERIFICATION_FAILED); + KMException.throwIt(KMError.KEY_USER_NOT_AUTHENTICATED); } if (KMInteger.compare(tmpVariables[0], tmpVariables[2]) < 0) { KMException.throwIt(KMError.KEY_USER_NOT_AUTHENTICATED); @@ -3141,11 +3141,11 @@ public class KMKeymasterApplet extends Applet implements AppletEvent, ExtendedLe short ptr = KMVerificationToken.cast(verToken).getMac(); // If mac length is zero then token is empty. if (KMByteBlob.cast(ptr).length() == 0) { - KMException.throwIt(KMError.INVALID_MAC_LENGTH); + KMException.throwIt(KMError.KEY_USER_NOT_AUTHENTICATED); } if (!verifyVerificationTokenMacInBigEndian(verToken, scratchPad)) { // Throw Exception if none of the combination works. - KMException.throwIt(KMError.VERIFICATION_FAILED); + KMException.throwIt(KMError.KEY_USER_NOT_AUTHENTICATED); } } |