diff options
| author | Subrahmanya Manikanta Venkateswarlu Bhamidipati Kameswara Sri <subrahmanyaman@google.com> | 2023-07-19 01:58:11 +0000 |
|---|---|---|
| committer | Subrahmanya Manikanta Venkateswarlu Bhamidipati Kameswara Sri <subrahmanyaman@google.com> | 2023-07-19 03:34:00 +0000 |
| commit | 1b8fddc7f671613101671a94d5f5270ffcf71086 (patch) | |
| tree | 0c84cf5e8992c893e76b3c63f122f0435a6acdb6 | |
| parent | 837bd68238cd162d5b83b3be493f8aebc5c5fc03 (diff) | |
| download | libese-1b8fddc7f671613101671a94d5f5270ffcf71086.tar.gz | |
Return appropriate error when an invalid timestamptoken is provided.
Bug: 291693170
Test: run vts -m VtsAidlKeyMintTarget
Change-Id: I6ff511f33b55ef38028af7d66b19c1261de75186
| -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); } } |