Skip to content

Updated Jcard functional tests after the latest deviceBootStatus changes. #155

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
Jun 11, 2022
Merged

Updated Jcard functional tests after the latest deviceBootStatus changes. #155

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6743fd5
Merge pull request #74 from divegeek/Javacard_KM_41_AOSP_UPMERGE_0630
subrahmanyaman Jun 8, 2022
9b50564
Updated the JCard functional tests
subrahmanyaman Jun 11, 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
44 changes: 44 additions & 0 deletions Applet/JCardSimProvider/test/com/android/javacard/test/KMFunctionalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,43 @@ private ResponseAPDU provisionSeLocked(CardSimulator simulator) {
return response;
}

private ResponseAPDU computeSharedSecret(CardSimulator simulator) {
short ret = getHmacSharingParams();
short error = KMInteger.cast(KMArray.cast(ret).get((short) 0)).getShort();
KMHmacSharingParameters params = KMHmacSharingParameters.cast(KMArray.cast(ret).get((short) 1));
short seed = params.getSeed();
short nonce = params.getNonce();

short params1 = KMHmacSharingParameters.instance();
KMHmacSharingParameters.cast(params1).setSeed(KMByteBlob.instance((short) 0));
short num = KMByteBlob.instance((short) 32);
Util.arrayCopyNonAtomic(
KMByteBlob.cast(nonce).getBuffer(),
KMByteBlob.cast(nonce).getStartOff(),
KMByteBlob.cast(num).getBuffer(),
KMByteBlob.cast(num).getStartOff(),
KMByteBlob.cast(num).length());

KMHmacSharingParameters.cast(params1).setNonce(num);
short params2 = KMHmacSharingParameters.instance();
KMHmacSharingParameters.cast(params2).setSeed(KMByteBlob.instance((short) 0));
num = KMByteBlob.instance((short) 32);
cryptoProvider.newRandomNumber(
KMByteBlob.cast(num).getBuffer(),
KMByteBlob.cast(num).getStartOff(),
KMByteBlob.cast(num).length());
KMHmacSharingParameters.cast(params2).setNonce(num);
short arr = KMArray.instance((short) 2);
KMArray.cast(arr).add((short) 0, params1);
KMArray.cast(arr).add((short) 1, params2);
short arrPtr = KMArray.instance((short) 1);
KMArray.cast(arrPtr).add((short) 0, arr);
CommandAPDU apdu = encodeApdu((byte) INS_COMPUTE_SHARED_HMAC_CMD, arrPtr);
// print(commandAPDU.getBytes());
ResponseAPDU response = simulator.transmitCommand(apdu);
return response;
}

private void provisionCmd(CardSimulator simulator) {
Assert.assertEquals(0x9000, provisionSigningKey(simulator).getSW());
Assert.assertEquals(0x9000, provisionSigningCertificate(simulator).getSW());
Expand All @@ -1004,6 +1041,8 @@ private void provisionCmd(CardSimulator simulator) {
setAndroidOSSystemProperties(simulator, (short) OS_VERSION, (short) OS_PATCH_LEVEL,
(short) VENDOR_PATCH_LEVEL);
Assert.assertEquals(0x9000, provisionLocked(simulator).getSW());
// negotiate shared secret.
Assert.assertEquals(0x9000, computeSharedSecret(simulator).getSW());
}

private void cleanUp() {
Expand Down Expand Up @@ -1575,6 +1614,7 @@ public void testRateLimitClearBufferAfterReboot() {
setBootParams(simulator, (short) BOOT_PATCH_LEVEL);
setAndroidOSSystemProperties(simulator, (short) OS_VERSION, (short) OS_PATCH_LEVEL,
(short) VENDOR_PATCH_LEVEL);
computeSharedSecret(simulator);
}
short rsaKeyArr = generateRsaKey(null, null, KMInteger.uint_8((byte) 1));
Assert.assertEquals(KMInteger.cast(KMArray.cast(rsaKeyArr).get((short) 0)).getShort(),
Expand Down Expand Up @@ -3230,6 +3270,7 @@ public void testVerifyOemUnLockAfterOemLockSuccess() {
// set android system properties
setAndroidOSSystemProperties(simulator, (short) OS_VERSION, (short) OS_PATCH_LEVEL,
(short) VENDOR_PATCH_LEVEL);
computeSharedSecret(simulator);
Assert.assertEquals(0x9000, provisionOemUnLock(simulator).getSW());
Assert.assertEquals(0x9000, provisionSharedSecret(simulator).getSW());
Assert.assertEquals(0x9000, provisionAttestIds(simulator).getSW());
Expand Down Expand Up @@ -3339,6 +3380,8 @@ public void testVerifyOemProvisionAfterOemLockFailure() {
Assert.assertEquals(0x9000, provisionAttestIds(simulator).getSW());
Assert.assertEquals(0x9000, provisionOEMRootPublicKey(simulator).getSW());
Assert.assertEquals(0x9000, provisionLocked(simulator).getSW());
// set bootup parameters
setBootParams(simulator, (short) BOOT_PATCH_LEVEL);
ResponseAPDU response = provisionSharedSecret(simulator);
Assert.assertEquals(0x9000, response.getSW());
byte[] respBuf = response.getBytes();
Expand Down Expand Up @@ -3465,6 +3508,7 @@ public void testUpgradeKey() {
setBootParams(simulator, (short) test_data[i][3]);
setAndroidOSSystemProperties(simulator, (short) test_data[i][0], (short) test_data[i][1],
(short) test_data[i][2]);
computeSharedSecret(simulator);
ret = upgradeKey(
KMByteBlob.instance(keyBlob, (short) 0, (short) keyBlob.length),
null, null, test_data[i][5]);
Expand Down