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

Updated fixes in NVM optimization#138

Merged
mdwivedi merged 1 commit into from
Jun 1, 2022
Merged

Updated fixes in NVM optimization #138

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
3 changes: 3 additions & 0 deletions Applet/src/com/android/javacard/keymaster/KMKeymintDataStore.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -788,6 +788,9 @@ public void persistOEMRootPublicKey(byte[] inBuff, short inOffset, short inLengt
if (inLength != 65) {
KMException.throwIt(KMError.INVALID_INPUT_LENGTH);
}
if(oemRootPublicKey == null) {
oemRootPublicKey = new byte[65];
}
Util.arrayCopy(inBuff, inOffset, oemRootPublicKey, (short) 0, inLength);
}

Expand Down
10 changes: 5 additions & 5 deletions Applet/src/com/android/javacard/keymaster/RemotelyProvisionedComponentDevice.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -437,9 +437,9 @@ public void processFinishSendData(APDU apdu) throws Exception {
ISOException.throwIt(ISO7816.SW_CONDITIONS_NOT_SATISFIED);
}
// PubKeysToSignMac
byte[] empty = {};
short empty = repository.alloc((short)0) ;
short len =
((KMOperation) operation[0]).sign(empty, (short) 0,
((KMOperation) operation[0]).sign(repository.getHeap(), (short) empty,
(short) 0, scratchPad, (short) 0);
// release operation
releaseOperation();
Expand DownExpand Up@@ -561,9 +561,9 @@ private boolean isAdditionalCertificateChainPresent() {

private short processFinalData(byte[] scratchPad) {
// Call finish on AES GCM Cipher
byte[] empty = {};
short empty = repository.alloc((short)0) ;
short len =
((KMOperation) operation[0]).finish(empty, (short) 0, (short) 0, scratchPad, (short) 0);
((KMOperation) operation[0]).finish(repository.getHeap(), (short) empty, (short) 0, scratchPad, (short) 0);
return len;
}

Expand DownExpand Up@@ -848,7 +848,7 @@ private KMDeviceUniqueKeyPair createDeviceUniqueKeyPair(boolean testMode, byte[]
*/
private short createDeviceInfo(byte[] scratchpad) {
// Device Info Key Value pairs.
for (short i = 0; i < 30; i++) {
for (short i = 0; i < 32; i++) {
rkpTmpVariables[i] = KMType.INVALID_VALUE;
}
short dataOffset = 2;
Expand Down