Skip to content

In test mode, don't include AdditionalCertChain in protectedData. #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdwivedi merged 2 commits into from
Sep 12, 2022
Merged

In test mode, don't include AdditionalCertChain in protectedData. #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14f1aa3
Merge pull request #105 from divegeek/Javacard_KeyMint_200_master
subrahmanyaman Aug 24, 2022
647c871
In RKP test mode, skip including AdditionalCertChain from ProtectedData
subrahmanyaman Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Applet/JCardSimProvider/test/com/android/javacard/test/KMRKPFunctionalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ public void testGenerateCsrProdMode() {
init();
short[] noOfKeys = {0, 5, 10};
for (int i = 0; i < noOfKeys.length; i++) {
testGenerateCsr(noOfKeys[i] /*no_keys*/, (short) 2 /*eek_chain_len*/, true /*testMode*/);
testGenerateCsr(noOfKeys[i] /*no_keys*/, (short) 2 /*eek_chain_len*/, false /*testMode*/);
KMRepository.instance().clean();
}
cleanUp();
Expand Down
8 changes: 5 additions & 3 deletions Applet/JCardSimProvider/test/com/android/javacard/test/KMTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ public static void validateProtectedData(KMSEProvider cryptoProvider, KMEncoder
// Validate the decrypted payload.
// payload = [signedMac + bcc + ? AdditionalCertChain]
//--------------------------------------------
short payloadLength = 3;
short payloadLength = testMode ? (short) 2 : (short) 3;
short additionalCertChain = 0;
short headersExp = KMCoseHeaders.exp();
short coseKeyExp = KMCoseKey.exp();
Expand All @@ -468,8 +468,10 @@ public static void validateProtectedData(KMSEProvider cryptoProvider, KMEncoder
KMArray.cast(arrInst).add((short) 2, KMByteBlob.exp());
KMArray.cast(arrInst).add((short) 3, KMByteBlob.exp());
short coseSignArr = KMArray.exp(arrInst);
additionalCertChain = KMMap.instance((short) 1);
KMMap.cast(additionalCertChain).add((short) 0, KMTextString.exp(), coseSignArr);
if (!testMode) {
additionalCertChain = KMMap.instance((short) 1);
KMMap.cast(additionalCertChain).add((short) 0, KMTextString.exp(), coseSignArr);
}
// protected payload exp
short payload = KMArray.instance(payloadLength);
KMArray.cast(payload).add((short) 0, signedMacArr);
Expand Down
4 changes: 4 additions & 0 deletions Applet/src/com/android/javacard/keymaster/RemotelyProvisionedComponentDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,10 @@ public void process(short ins, APDU apdu) throws Exception {
}

private boolean isAdditionalCertificateChainPresent() {
if ((TRUE == data[getEntry(TEST_MODE)])) {
// In test mode, don't include AdditionalCertificateChain in ProtectedData.
return false;
}
return (storeDataInst.getAdditionalCertChainLength() == 0 ? false : true);
}

Expand Down