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

Jc keymaster 41 android 11 applet upgrade fix#27

Merged
mdwivedi merged 3 commits into from
Mar 31, 2021
Merged

Jc keymaster 41 android 11 applet upgrade fix #27

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af03ef0
Merge pull request #61 from divegeek/jc_keymaster_41_android_11
BKSSMVenkateswarlu Mar 24, 2021
2af431f
Applet should be able to upgrade even if provision is not done.
Mar 25, 2021
723576b
Updated comment
BKSSMVenkateswarlu Mar 28, 2021
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
6 changes: 6 additions & 0 deletions Applet/AndroidSEProvider/src/com/android/javacard/keymaster/KMAndroidSEProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -218,6 +218,12 @@ public KMAndroidSEProvider() {
//Allocate buffer for certificate chain.
if (!isUpgrading()) {
certificateChain = new byte[CERT_CHAIN_MAX_SIZE];
// Initialize attestationKey and preShared key with zeros.
Util.arrayFillNonAtomic(tmpArray, (short) 0, TMP_ARRAY_SIZE, (byte) 0);
// Create attestation key of P-256 curve.
createAttestationKey(tmpArray, (short)0, (short) 32);
// Pre-shared secret key length is 32 bytes.
createPresharedKey(tmpArray, (short)0, (short) KMRepository.SHARED_SECRET_KEY_SIZE);
}
androidSEProvider = this;
}
Expand Down