Merge pull request #228 from subrahmanyaman/Javacard_KeyMint_200_master

mdwivedi · web-flow · commit 1c31b1841367 · 2022-10-06T12:52:18.000-07:00
Set upper limit for RKP challenge
diff --git a/Applet/src/com/android/javacard/keymaster/RemotelyProvisionedComponentDevice.java b/Applet/src/com/android/javacard/keymaster/RemotelyProvisionedComponentDevice.java
@@ -413,7 +413,7 @@ public void processUpdateChallenge(APDU apdu) throws Exception {
       // Store the challenge in the data table.
       short challenge = KMArray.cast(arr).get((short) 0);
       short challengeLen = KMByteBlob.cast(challenge).length();
-      if (challengeLen < 32 || challengeLen > 64) {
+      if (challengeLen > 64) {
         KMException.throwIt(KMError.INVALID_INPUT_LENGTH);
       }
       short dataEntryIndex = createEntry(CHALLENGE, challengeLen);

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ public void processUpdateChallenge(APDU apdu) throws Exception {`
`413`	`413`	`// Store the challenge in the data table.`
`414`	`414`	`short challenge = KMArray.cast(arr).get((short) 0);`
`415`	`415`	`short challengeLen = KMByteBlob.cast(challenge).length();`
`416`		`- if (challengeLen < 32 \|\| challengeLen > 64) {`
	`416`	`+ if (challengeLen > 64) {`
`417`	`417`	`KMException.throwIt(KMError.INVALID_INPUT_LENGTH);`
`418`	`418`	`}`
`419`	`419`	`short dataEntryIndex = createEntry(CHALLENGE, challengeLen);`