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

Applet upgrade#169

Merged
mdwivedi merged 2 commits into from
Jun 21, 2022
Merged

Applet upgrade #169

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
a2f4387
updated applet upgrade
AvinashHedage Jun 20, 2022
d76bc17
Updated applet upgrade
AvinashHedage Jun 21, 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
63 changes: 18 additions & 45 deletions Applet/AndroidSEProvider/src/com/android/javacard/keymaster/KMAndroidSEApplet.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -223,43 +223,32 @@ private boolean isCommandAllowed(short apduIns) {
}

private boolean isSeFactoryProvisioningLocked() {
short dInex = repository.allocReclaimableMemory((short)2);
byte data[] = repository.getHeap();
kmDataStore.getProvisionStatus(data, dInex);
short pStatus = Util.getShort(data, dInex);
short pStatus = kmDataStore.getProvisionStatus();
boolean result = false;
if ((0 != (pStatus & PROVISION_STATUS_SE_LOCKED))) {
result = true;
}
repository.reclaimMemory((short)2);
return result;
}

private boolean isSeFactoryProvisioningComplete() {
short dIndex = repository.allocReclaimableMemory((short)2);
byte data[] = repository.getHeap();
kmDataStore.getProvisionStatus(data, dIndex);
short pStatus = Util.getShort(data, dIndex);
boolean result = false;
if ((0 != (pStatus & PROVISION_STATUS_DEVICE_UNIQUE_KEYPAIR))
&& (0 != ((pStatus & PROVISION_STATUS_ADDITIONAL_CERT_CHAIN)))) {
result = true;
short pStatus = kmDataStore.getProvisionStatus();
short seCompleteStatus = PROVISION_STATUS_DEVICE_UNIQUE_KEYPAIR | PROVISION_STATUS_ADDITIONAL_CERT_CHAIN;
if (seCompleteStatus == (pStatus & seCompleteStatus)) {
return true;
}
repository.reclaimMemory((short)2);
return result;
return false;
}

private void processOEMUnlockProvisionCmd(APDU apdu) {
authenticateOEM(OEM_UNLOCK_PROVISION_VERIFICATION_LABEL, apdu);
kmDataStore.setProvisionLock(false);
kmDataStore.unlockProvision(PROVISION_STATUS_PROVISIONING_LOCKED);
kmDataStore.unlockProvision();
sendResponse(apdu, KMError.OK);
}

private void processOEMLockProvisionCmd(APDU apdu) {
authenticateOEM(OEM_LOCK_PROVISION_VERIFICATION_LABEL, apdu);
authenticateOEM(OEM_LOCK_PROVISION_VERIFICATION_LABEL, apdu);
// Enable the lock bit in provision status.
kmDataStore.setProvisionLock(true);
kmDataStore.setProvisionStatus(PROVISION_STATUS_PROVISIONING_LOCKED);
sendResponse(apdu, KMError.OK);
}
Expand DownExpand Up@@ -500,7 +489,8 @@ private static short buildErrorStatus(short err) {

private void processGetProvisionStatusCmd(APDU apdu) {
byte[] scratchpad = apdu.getBuffer();
kmDataStore.getProvisionStatus(scratchpad, (short) 0);
short pStatus = kmDataStore.getProvisionStatus();
Util.setShort(scratchpad, (short)0, pStatus);
short resp = KMArray.instance((short) 2);
KMArray.cast(resp).add((short) 0, buildErrorStatus(KMError.OK));
KMArray.cast(resp).add((short) 1, KMInteger.instance(scratchpad, (short)0, (short)2));
Expand DownExpand Up@@ -571,19 +561,13 @@ private void processSetBootParamsCmd(APDU apdu) {
}

private boolean isProvisioningComplete() {
short dInex = repository.allocReclaimableMemory((short)2);
byte data[] = repository.getHeap();
kmDataStore.getProvisionStatus(data, dInex);
short pStatus = Util.getShort(data, dInex);
boolean result = false;
if (kmDataStore.isProvisionLocked() || ((0 != (pStatus & PROVISION_STATUS_DEVICE_UNIQUE_KEYPAIR))
&& (0 != (pStatus & PROVISION_STATUS_ADDITIONAL_CERT_CHAIN))
&& (0 != (pStatus & PROVISION_STATUS_PRESHARED_SECRET))
&& (0 != (pStatus & PROVISION_STATUS_ATTEST_IDS)))) {
result = true;
short pStatus = kmDataStore.getProvisionStatus();
short pCompleteStatus = PROVISION_STATUS_DEVICE_UNIQUE_KEYPAIR | PROVISION_STATUS_ADDITIONAL_CERT_CHAIN |
PROVISION_STATUS_PRESHARED_SECRET | PROVISION_STATUS_ATTEST_IDS;
if (kmDataStore.isProvisionLocked() || (pCompleteStatus == (pStatus & pCompleteStatus))) {
return true;
}
repository.reclaimMemory((short)2);
return result;
return false;
}

@Override
Expand All@@ -596,20 +580,9 @@ public void onConsolidate() {

private boolean isUpgradeAllowed(short oldVersion) {
boolean upgradeAllowed = false;
short oldMajorVersion = (short) ((oldVersion >> 8) & 0x00FF);
short oldMinorVersion = (short) (oldVersion & 0x00FF);
short currentMajorVersion = (short) (KM_APPLET_PACKAGE_VERSION >> 8 & 0x00FF);
short currentMinorVersion = (short) (KM_APPLET_PACKAGE_VERSION & 0x00FF);
// Downgrade of the Applet is not allowed.
// Upgrade is not allowed to a next version which is not immediate.
if ((short) (currentMajorVersion - oldMajorVersion) == 1) {
if (currentMinorVersion == 0) {
upgradeAllowed = true;
}
} else if ((short) (currentMajorVersion - oldMajorVersion) == 0) {
if (currentMinorVersion >= oldMinorVersion) {
upgradeAllowed = true;
}
if (KM_APPLET_PACKAGE_VERSION >= oldVersion) {
upgradeAllowed = true;
}
return upgradeAllowed;
}
Expand Down
50 changes: 17 additions & 33 deletions Applet/JCardSimProvider/src/com/android/javacard/keymaster/KMJCardSimApplet.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,50 +204,39 @@ private boolean isCommandAllowed(short apduIns) {
default:
// Allow other commands only if provision is completed.
if (!isProvisioningComplete()) {
result = false;
result = false;
}
}
return result;
}

private boolean isSeFactoryProvisioningLocked() {
short dInex = repository.allocReclaimableMemory((short)2);
byte data[] = repository.getHeap();
kmDataStore.getProvisionStatus(data, dInex);
short pStatus = Util.getShort(data, dInex);
short pStatus = kmDataStore.getProvisionStatus();
boolean result = false;
if ((0 != (pStatus & PROVISION_STATUS_SE_LOCKED))) {
result = true;
}
repository.reclaimMemory((short)2);
return result;
}

private boolean isSeFactoryProvisioningComplete() {
short dIndex = repository.allocReclaimableMemory((short)2);
byte data[] = repository.getHeap();
kmDataStore.getProvisionStatus(data, dIndex);
short pStatus = Util.getShort(data, dIndex);
boolean result = false;
if ((0 != (pStatus & PROVISION_STATUS_DEVICE_UNIQUE_KEYPAIR))
&& (0 != ((pStatus & PROVISION_STATUS_ADDITIONAL_CERT_CHAIN)))) {
result = true;
short pStatus = kmDataStore.getProvisionStatus();
short seCompleteStatus = PROVISION_STATUS_DEVICE_UNIQUE_KEYPAIR | PROVISION_STATUS_ADDITIONAL_CERT_CHAIN;
if (seCompleteStatus == (pStatus & seCompleteStatus)) {
return true;
}
repository.reclaimMemory((short)2);
return result;
return false;
}

private void processOEMUnlockProvisionCmd(APDU apdu) {
authenticateOEM(OEM_UNLOCK_PROVISION_VERIFICATION_LABEL, apdu);
kmDataStore.setProvisionLock(false);
kmDataStore.unlockProvision(PROVISION_STATUS_PROVISIONING_LOCKED);
kmDataStore.unlockProvision();
sendResponse(apdu, KMError.OK);
}

private void processOEMLockProvisionCmd(APDU apdu) {
authenticateOEM(OEM_LOCK_PROVISION_VERIFICATION_LABEL, apdu);
authenticateOEM(OEM_LOCK_PROVISION_VERIFICATION_LABEL, apdu);
// Enable the lock bit in provision status.
kmDataStore.setProvisionLock(true);
kmDataStore.setProvisionStatus(PROVISION_STATUS_PROVISIONING_LOCKED);
sendResponse(apdu, KMError.OK);
}
Expand DownExpand Up@@ -488,7 +477,8 @@ private static short buildErrorStatus(short err) {

private void processGetProvisionStatusCmd(APDU apdu) {
byte[] scratchpad = apdu.getBuffer();
kmDataStore.getProvisionStatus(scratchpad, (short) 0);
short pStatus = kmDataStore.getProvisionStatus();
Util.setShort(scratchpad, (short)0, pStatus);
short resp = KMArray.instance((short) 2);
KMArray.cast(resp).add((short) 0, buildErrorStatus(KMError.OK));
KMArray.cast(resp).add((short) 1, KMInteger.instance(scratchpad, (short)0, (short)2));
Expand DownExpand Up@@ -559,19 +549,13 @@ private void processSetBootParamsCmd(APDU apdu) {
}

private boolean isProvisioningComplete() {
short dInex = repository.allocReclaimableMemory((short)2);
byte data[] = repository.getHeap();
kmDataStore.getProvisionStatus(data, dInex);
short pStatus = Util.getShort(data, dInex);
boolean result = false;
if (kmDataStore.isProvisionLocked() || ((0 != (pStatus & PROVISION_STATUS_DEVICE_UNIQUE_KEYPAIR))
&& (0 != (pStatus & PROVISION_STATUS_ADDITIONAL_CERT_CHAIN))
&& (0 != (pStatus & PROVISION_STATUS_PRESHARED_SECRET))
&& (0 != (pStatus & PROVISION_STATUS_ATTEST_IDS)))) {
result = true;
short pStatus = kmDataStore.getProvisionStatus();
short pCompleteStatus = PROVISION_STATUS_DEVICE_UNIQUE_KEYPAIR | PROVISION_STATUS_ADDITIONAL_CERT_CHAIN |
PROVISION_STATUS_PRESHARED_SECRET | PROVISION_STATUS_ATTEST_IDS;
if (kmDataStore.isProvisionLocked() || (pCompleteStatus == (pStatus & pCompleteStatus))) {
return true;
}
repository.reclaimMemory((short)2);
return result;
return false;
}

private short validateApdu(APDU apdu) {
Expand Down
Loading