diff options
| author | Subrahmanyaman <subrahmanyaman@google.com> | 2023-06-12 23:07:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-12 23:07:52 +0000 |
| commit | 9bb471727f9f20485cef24234da99991fc981bc4 (patch) | |
| tree | 3d2b559c6572d641bf33d67d782f1e6df23f31e8 | |
| parent | 1c2a04a779839a75bd583e5f63286b7387131bcf (diff) | |
| parent | e4cf2cfdca9ca25fcb89619ac96222fde5c72493 (diff) | |
| download | libese-9bb471727f9f20485cef24234da99991fc981bc4.tar.gz | |
Update the RKP Challenge size check. am: e4cf2cfdca
Original change: https://android-review.googlesource.com/c/platform/external/libese/+/2615691
Change-Id: Ie9b13299a388c6f35fcedbcfa1827ed9bc78adcc
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/KMRemotelyProvisionedComponentDevice.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMRemotelyProvisionedComponentDevice.java b/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMRemotelyProvisionedComponentDevice.java index d69534d..da6d518 100644 --- a/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMRemotelyProvisionedComponentDevice.java +++ b/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMRemotelyProvisionedComponentDevice.java @@ -342,9 +342,9 @@ public class KMRemotelyProvisionedComponentDevice { short versionLength = encoder.getEncodedLength(versionPtr); short certTypeLen = encoder.getEncodedLength(certTypePtr); - short challengeLen = (short) KMByteBlob.cast(challengeByteBlob).length(); - if (challengeLen < 16 || challengeLen > 64) { - KMException.throwIt(KMError.INVALID_INPUT_LENGTH); + short challengeLen = KMByteBlob.cast(challengeByteBlob).length(); + if (challengeLen > 64) { + KMException.throwIt(KMError.STATUS_FAILED); } short challengeHeaderLen = encoder.getEncodedBytesLength(challengeLen); short deviceInfoLen = encoder.getEncodedLength(deviceInfo); |