Skip to content
This repository was archived by the owner on May 24, 2026. It is now read-only.

updated provision status condition check for INS_OEM_LOCK_PROVISIONING_CMD …#205

Merged
mdwivedi merged 1 commit into from
Jul 22, 2022
Merged

updated provision status condition check for INS_OEM_LOCK_PROVISIONING_CMD … #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/AndroidSEProvider/src/com/android/javacard/keymaster/KMAndroidSEApplet.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -563,7 +563,7 @@ private void processSetBootParamsCmd(APDU apdu) {
private boolean isProvisioningComplete() {
short pStatus = kmDataStore.getProvisionStatus();
short pCompleteStatus = PROVISION_STATUS_DEVICE_UNIQUE_KEYPAIR | PROVISION_STATUS_ADDITIONAL_CERT_CHAIN |
PROVISION_STATUS_PRESHARED_SECRET | PROVISION_STATUS_ATTEST_IDS;
PROVISION_STATUS_PRESHARED_SECRET | PROVISION_STATUS_ATTEST_IDS | PROVISION_STATUS_OEM_PUBLIC_KEY;
if (kmDataStore.isProvisionLocked() || (pCompleteStatus == (pStatus & pCompleteStatus))) {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion Applet/JCardSimProvider/src/com/android/javacard/keymaster/KMJCardSimApplet.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,7 +551,7 @@ private void processSetBootParamsCmd(APDU apdu) {
private boolean isProvisioningComplete() {
short pStatus = kmDataStore.getProvisionStatus();
short pCompleteStatus = PROVISION_STATUS_DEVICE_UNIQUE_KEYPAIR | PROVISION_STATUS_ADDITIONAL_CERT_CHAIN |
PROVISION_STATUS_PRESHARED_SECRET | PROVISION_STATUS_ATTEST_IDS;
PROVISION_STATUS_PRESHARED_SECRET | PROVISION_STATUS_ATTEST_IDS | PROVISION_STATUS_OEM_PUBLIC_KEY;
if (kmDataStore.isProvisionLocked() || (pCompleteStatus == (pStatus & pCompleteStatus))) {
return true;
}
Expand Down
52 changes: 25 additions & 27 deletions Applet/JCardSimProviderLib/src/com/android/javacard/seprovider/KMJCardSimulator.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1488,43 +1488,41 @@ public com.android.javacard.seprovider.KMPreSharedKey createPreSharedKey(
}


@Override
public KMOperation getRkpOperation(byte purpose, byte alg,
@Override
public KMOperation getRkpOperation(byte purpose, byte alg,
byte digest, byte padding, byte blockMode, byte[] keyBuf, short keyStart,
short keyLength, byte[] ivBuf, short ivStart, short ivLength,
short macLength) {
KMOperation opr = null;
switch (alg) {
case KMType.AES:
KMCipher aesGcm = createAesGcmCipher(purpose, macLength, keyBuf, keyStart, keyLength,
case KMType.AES:
KMCipher aesGcm = createAesGcmCipher(purpose, macLength, keyBuf, keyStart, keyLength,
ivBuf, ivStart, ivLength);
opr = new KMOperationImpl(aesGcm);
break;
case KMType.HMAC:
Signature signerVerifier = createHmacSignerVerifier(purpose, digest, keyBuf, keyStart,
opr = new KMOperationImpl(aesGcm);
break;
case KMType.HMAC:
Signature signerVerifier = createHmacSignerVerifier(purpose, digest, keyBuf, keyStart,
keyLength);
opr = new KMOperationImpl(signerVerifier);
break;
default:
CryptoException.throwIt(CryptoException.NO_SUCH_ALGORITHM);
break;
opr = new KMOperationImpl(signerVerifier);
break;
default:
CryptoException.throwIt(CryptoException.NO_SUCH_ALGORITHM);
break;
}
return opr;
}
}

@Override
public boolean isBootSignalEventSupported() {
return false;
}
@Override
public boolean isBootSignalEventSupported() {
return false;
}

@Override
public boolean isDeviceRebooted() {
return false;
}
@Override
public boolean isDeviceRebooted() {
return false;
}

@Override
public void clearDeviceBooted(boolean resetBootFlag) {
// TODO Auto-generated method stub

}
@Override
public void clearDeviceBooted(boolean resetBootFlag) {
}
}