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

Keymint ready bugfix#177

Merged
mdwivedi merged 4 commits into from
Jun 24, 2022
Merged

Keymint ready bugfix #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d67bf5
Merge pull request #60 from divegeek/Javacard_KeyMint_100_master
subrahmanyaman Apr 29, 2022
7cc05c0
Merge pull request #77 from divegeek/Javacard_KeyMint_100_master
subrahmanyaman Jun 14, 2022
a302511
Merge pull request #81 from divegeek/Javacard_KeyMint_100_master
subrahmanyaman Jun 23, 2022
500caa1
Fixed the issue in isKeyMintRedy function
subrahmanyaman Jun 24, 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
4 changes: 2 additions & 2 deletions Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -456,7 +456,7 @@ public void process(APDU apdu) {
}
byte[] apduBuffer = apdu.getBuffer();
byte apduIns = apduBuffer[ISO7816.OFFSET_INS];
if (!isKeymintReady(apduIns)) {
if (!isKeyMintReady(apduIns)) {
ISOException.throwIt(ISO7816.SW_COMMAND_NOT_ALLOWED);
}
switch (apduIns) {
Expand DownExpand Up@@ -568,7 +568,7 @@ public void process(APDU apdu) {
// 1. boot parameters are set,
// 2. system properties are set and
// 3. computed the shared secret successfully.
private boolean isKeymintReady(byte apduIns) {
private boolean isKeyMintReady(byte apduIns) {
if(kmDataStore.isDeviceReady()) {
return true;
}
Expand Down
12 changes: 6 additions & 6 deletions Applet/src/com/android/javacard/keymaster/KMKeymintDataStore.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -345,12 +345,12 @@ public void setDeviceBootStatus(byte initStatus) {
}

public boolean isDeviceReady() {
boolean result = false;
short offset = repository.allocReclaimableMemory(DEVICE_STATUS_FLAG_SIZE);
byte[] buf = repository.getHeap();
getDeviceBootStatus(buf, offset);
byte bootCompleteStatus = SET_BOOT_PARAMS_SUCCESS | SET_SYSTEM_PROPERTIES_SUCCESS |
SET_SYSTEM_PROPERTIES_SUCCESS;
boolean result = false;
short offset = repository.allocReclaimableMemory(DEVICE_STATUS_FLAG_SIZE);
byte[] buf = repository.getHeap();
getDeviceBootStatus(buf, offset);
byte bootCompleteStatus = (SET_BOOT_PARAMS_SUCCESS | SET_SYSTEM_PROPERTIES_SUCCESS |
NEGOTIATED_SHARED_SECRET_SUCCESS);
if (bootCompleteStatus == (buf[offset] & bootCompleteStatus)) {
result = true;
}
Expand Down