Skip to content

Javacard key mint 200 master#107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
subrahmanyaman merged 5 commits into from
Sep 12, 2022
Merged

Javacard key mint 200 master #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
180f913
Updated the KeyMint version to 200 in attestation record
subrahmanyaman Aug 31, 2022
156d84a
Reserved 4, 5 and 6 INS values for vendor usage.
subrahmanyaman Aug 31, 2022
d04936e
Merge pull request #217 from subrahmanyaman/Javacard_KeyMint_200_master
mdwivedi Sep 12, 2022
5e36145
Merge pull request #219 from subrahmanyaman/divegeek_200_attestation_…
mdwivedi Sep 12, 2022
3b132a6
Merge pull request #221 from subrahmanyaman/keymint200_ins_update
mdwivedi Sep 12, 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
11 changes: 6 additions & 5 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@@ -45,10 +45,7 @@ public class KMAndroidSEApplet extends KMKeymasterApplet implements OnUpgradeLis
// Provider specific Commands
private static final byte INS_KEYMINT_PROVIDER_APDU_START = 0x00;
private static final byte INS_PROVISION_ATTEST_IDS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 3;
private static final byte INS_PROVISION_PRESHARED_SECRET_CMD =
INS_KEYMINT_PROVIDER_APDU_START + 4;
private static final byte INS_SET_BOOT_PARAMS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 5; // Unused
private static final byte INS_OEM_LOCK_PROVISIONING_CMD = INS_KEYMINT_PROVIDER_APDU_START + 6;
// Commands 4, 5 and 6 are reserved for vendor usage.
private static final byte INS_GET_PROVISION_STATUS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 7;
//0x08 was reserved for INS_INIT_STRONGBOX_CMD
//0x09 was reserved for INS_SET_BOOT_ENDED_CMD earlier. it is unused now.
Expand All@@ -59,7 +56,11 @@ public class KMAndroidSEApplet extends KMKeymasterApplet implements OnUpgradeLis
INS_KEYMINT_PROVIDER_APDU_START + 13;
private static final byte INS_PROVISION_RKP_ADDITIONAL_CERT_CHAIN_CMD =
INS_KEYMINT_PROVIDER_APDU_START + 14;
private static final byte INS_PROVISION_SECURE_BOOT_MODE_CMD = INS_KEYMINT_PROVIDER_APDU_START + 15;
private static final byte INS_PROVISION_PRESHARED_SECRET_CMD =
INS_KEYMINT_PROVIDER_APDU_START + 15;
private static final byte INS_SET_BOOT_PARAMS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 16; // Unused
private static final byte INS_OEM_LOCK_PROVISIONING_CMD = INS_KEYMINT_PROVIDER_APDU_START + 17;
private static final byte INS_PROVISION_SECURE_BOOT_MODE_CMD = INS_KEYMINT_PROVIDER_APDU_START + 18;

private static final byte INS_KEYMINT_PROVIDER_APDU_END = 0x1F;
public static final byte BOOT_KEY_MAX_SIZE = 32;
Expand Down
16 changes: 8 additions & 8 deletions Applet/AndroidSEProvider/src/com/android/javacard/keymaster/KMAttestationCertImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,8 +136,8 @@ public class KMAttestationCertImpl implements KMAttestationCert {
private static final byte keyUsageKeyAgreement = (byte) 0x08; // 4th- bit
private static final byte keyUsageCertSign = (byte) 0x04; // 5th- bit

private static final byte KEYMASTER_VERSION = 100;
private static final byte ATTESTATION_VERSION = 100;
private static final short KEYMINT_VERSION = 200;
private static final short ATTESTATION_VERSION = 200;
private static final byte[] pubExponent = {0x01, 0x00, 0x01};
private static final byte SERIAL_NUM = (byte) 0x01;
private static final byte X509_VERSION = (byte) 0x02;
Expand DownExpand Up@@ -497,9 +497,9 @@ private static void pushRsaEncryption() {
}

// KeyDescription ::= SEQUENCE {
// attestationVersion INTEGER, # Value 3
// attestationVersion INTEGER, # Value 200
// attestationSecurityLevel SecurityLevel, # See below
// keymasterVersion INTEGER, # Value 4
// keymasterVersion INTEGER, # Value 200
// keymasterSecurityLevel SecurityLevel, # See below
// attestationChallenge OCTET_STRING, # Tag::ATTESTATION_CHALLENGE from attestParams
// uniqueId OCTET_STRING, # Empty unless key has Tag::INCLUDE_UNIQUE_ID
Expand All@@ -523,11 +523,11 @@ private static void pushKeyDescription() {
KMByteBlob.cast(attChallenge).getStartOff(),
KMByteBlob.cast(attChallenge).length());
pushEnumerated(KMType.STRONGBOX);
pushByte(KEYMASTER_VERSION);
pushIntegerHeader((short) 1);
pushShort(KEYMINT_VERSION);
pushIntegerHeader((short) 2);
pushEnumerated(KMType.STRONGBOX);
pushByte(ATTESTATION_VERSION);
pushIntegerHeader((short) 1);
pushShort(ATTESTATION_VERSION);
pushIntegerHeader((short) 2);
pushSequenceHeader((short) (last - stackPtr));
pushOctetStringHeader((short) (last - stackPtr));
pushBytes(androidExtn, (short) 0, (short) androidExtn.length);
Expand Down
16 changes: 8 additions & 8 deletions Applet/JCardSimProvider/src/com/android/javacard/keymaster/KMAttestationCertImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,8 +136,8 @@ public class KMAttestationCertImpl implements KMAttestationCert {
private static final byte keyUsageKeyAgreement = (byte) 0x08; // 4th- bit
private static final byte keyUsageCertSign = (byte) 0x04; // 5th- bit

private static final byte KEYMASTER_VERSION = 100;
private static final byte ATTESTATION_VERSION = 100;
private static final short KEYMINT_VERSION = 200;
private static final short ATTESTATION_VERSION = 200;
private static final byte[] pubExponent = {0x01, 0x00, 0x01};
private static final byte SERIAL_NUM = (byte) 0x01;
private static final byte X509_VERSION = (byte) 0x02;
Expand DownExpand Up@@ -497,9 +497,9 @@ private static void pushRsaEncryption() {
}

// KeyDescription ::= SEQUENCE {
// attestationVersion INTEGER, # Value 3
// attestationVersion INTEGER, # Value 200
// attestationSecurityLevel SecurityLevel, # See below
// keymasterVersion INTEGER, # Value 4
// keymasterVersion INTEGER, # Value 200
// keymasterSecurityLevel SecurityLevel, # See below
// attestationChallenge OCTET_STRING, # Tag::ATTESTATION_CHALLENGE from attestParams
// uniqueId OCTET_STRING, # Empty unless key has Tag::INCLUDE_UNIQUE_ID
Expand All@@ -523,11 +523,11 @@ private static void pushKeyDescription() {
KMByteBlob.cast(attChallenge).getStartOff(),
KMByteBlob.cast(attChallenge).length());
pushEnumerated(KMType.STRONGBOX);
pushByte(KEYMASTER_VERSION);
pushIntegerHeader((short) 1);
pushShort(KEYMINT_VERSION);
pushIntegerHeader((short) 2);
pushEnumerated(KMType.STRONGBOX);
pushByte(ATTESTATION_VERSION);
pushIntegerHeader((short) 1);
pushShort(ATTESTATION_VERSION);
pushIntegerHeader((short) 2);
pushSequenceHeader((short) (last - stackPtr));
pushOctetStringHeader((short) (last - stackPtr));
pushBytes(androidExtn, (short) 0, (short) androidExtn.length);
Expand Down
33 changes: 17 additions & 16 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@@ -31,24 +31,25 @@ public class KMJCardSimApplet extends KMKeymasterApplet {
private static final byte ILLEGAL_STATE = KM_BEGIN_STATE + 1;
private static final short POWER_RESET_MASK_FLAG = (short) 0x4000;

//Provider specific Commands
private static final byte INS_KEYMINT_PROVIDER_APDU_START = 0x00;
private static final byte INS_PROVISION_ATTEST_IDS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 3;
private static final byte INS_PROVISION_PRESHARED_SECRET_CMD =
INS_KEYMINT_PROVIDER_APDU_START + 4;
private static final byte INS_SET_BOOT_PARAMS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 5; // Unused
private static final byte INS_OEM_LOCK_PROVISIONING_CMD = INS_KEYMINT_PROVIDER_APDU_START + 6;
private static final byte INS_GET_PROVISION_STATUS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 7;
//0x08 was reserved for INS_INIT_STRONGBOX_CMD
//0x09 was reserved for INS_SET_BOOT_ENDED_CMD earlier. it is unused now.
private static final byte INS_SE_FACTORY_PROVISIONING_LOCK_CMD = INS_KEYMINT_PROVIDER_APDU_START + 10;
private static final byte INS_PROVISION_OEM_ROOT_PUBLIC_KEY_CMD = INS_KEYMINT_PROVIDER_APDU_START + 11;
private static final byte INS_OEM_UNLOCK_PROVISIONING_CMD = INS_KEYMINT_PROVIDER_APDU_START + 12;
private static final byte INS_PROVISION_RKP_DEVICE_UNIQUE_KEYPAIR_CMD =
// Provider specific Commands
private static final byte INS_KEYMINT_PROVIDER_APDU_START = 0x00;
private static final byte INS_PROVISION_ATTEST_IDS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 3;
// Commands 4, 5 and 6 are reserved for vendor usage.
private static final byte INS_GET_PROVISION_STATUS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 7;
// 0x08 was reserved for INS_INIT_STRONGBOX_CMD
// 0x09 was reserved for INS_SET_BOOT_ENDED_CMD earlier. it is unused now.
private static final byte INS_SE_FACTORY_PROVISIONING_LOCK_CMD = INS_KEYMINT_PROVIDER_APDU_START + 10;
private static final byte INS_PROVISION_OEM_ROOT_PUBLIC_KEY_CMD = INS_KEYMINT_PROVIDER_APDU_START + 11;
private static final byte INS_OEM_UNLOCK_PROVISIONING_CMD = INS_KEYMINT_PROVIDER_APDU_START + 12;
private static final byte INS_PROVISION_RKP_DEVICE_UNIQUE_KEYPAIR_CMD =
INS_KEYMINT_PROVIDER_APDU_START + 13;
private static final byte INS_PROVISION_RKP_ADDITIONAL_CERT_CHAIN_CMD =
private static final byte INS_PROVISION_RKP_ADDITIONAL_CERT_CHAIN_CMD =
INS_KEYMINT_PROVIDER_APDU_START + 14;
private static final byte INS_PROVISION_SECURE_BOOT_MODE_CMD = INS_KEYMINT_PROVIDER_APDU_START + 15;
private static final byte INS_PROVISION_PRESHARED_SECRET_CMD =
INS_KEYMINT_PROVIDER_APDU_START + 15;
private static final byte INS_SET_BOOT_PARAMS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 16; // Unused
private static final byte INS_OEM_LOCK_PROVISIONING_CMD = INS_KEYMINT_PROVIDER_APDU_START + 17;
private static final byte INS_PROVISION_SECURE_BOOT_MODE_CMD = INS_KEYMINT_PROVIDER_APDU_START + 18;

private static final byte INS_KEYMINT_PROVIDER_APDU_END = 0x1F;
public static final byte BOOT_KEY_MAX_SIZE = 32;
Expand Down
10 changes: 5 additions & 5 deletions Applet/JCardSimProvider/test/com/android/javacard/test/KMProvision.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,6 @@ public class KMProvision {
// Provision Instructions
private static final byte INS_KEYMINT_PROVIDER_APDU_START = 0x00;
private static final byte INS_PROVISION_ATTEST_IDS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 3;
private static final byte INS_PROVISION_PRESHARED_SECRET_CMD =
INS_KEYMINT_PROVIDER_APDU_START + 4;
private static final byte INS_SET_BOOT_PARAMS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 5; // Unused
private static final byte INS_OEM_LOCK_PROVISIONING_CMD = INS_KEYMINT_PROVIDER_APDU_START + 6;
private static final byte INS_GET_PROVISION_STATUS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 7;
//0x08 was reserved for INS_INIT_STRONGBOX_CMD
//0x09 was reserved for INS_SET_BOOT_ENDED_CMD earlier. it is unused now.
Expand All@@ -55,7 +51,11 @@ public class KMProvision {
INS_KEYMINT_PROVIDER_APDU_START + 13;
private static final byte INS_PROVISION_RKP_ADDITIONAL_CERT_CHAIN_CMD =
INS_KEYMINT_PROVIDER_APDU_START + 14;
private static final byte INS_PROVISION_SECURE_BOOT_MODE_CMD = INS_KEYMINT_PROVIDER_APDU_START + 15;
private static final byte INS_PROVISION_PRESHARED_SECRET_CMD =
INS_KEYMINT_PROVIDER_APDU_START + 15;
private static final byte INS_SET_BOOT_PARAMS_CMD = INS_KEYMINT_PROVIDER_APDU_START + 16;
private static final byte INS_OEM_LOCK_PROVISIONING_CMD = INS_KEYMINT_PROVIDER_APDU_START + 17;
private static final byte INS_PROVISION_SECURE_BOOT_MODE_CMD = INS_KEYMINT_PROVIDER_APDU_START + 18;
// Top 32 commands are reserved for provisioning.
private static final byte INS_END_KM_PROVISION_CMD = 0x20;

Expand Down
8 changes: 4 additions & 4 deletions ProvisioningTool/include/constants.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,16 +103,16 @@ constexpr char kSecureBootMode[] = "secure_boot_mode";

// Instruction constatnts
constexpr int kAttestationIdsCmd = INS_BEGIN_KM_CMD + 3;
constexpr int kPresharedSecretCmd = INS_BEGIN_KM_CMD + 4;
constexpr int kBootParamsCmd = INS_BEGIN_KM_CMD + 5;
constexpr int kOemLockProvisionCmd = INS_BEGIN_KM_CMD + 6;
constexpr int kPresharedSecretCmd = INS_BEGIN_KM_CMD + 15;
constexpr int kBootParamsCmd = INS_BEGIN_KM_CMD + 16;
constexpr int kOemLockProvisionCmd = INS_BEGIN_KM_CMD + 17;
constexpr int kGetProvisionStatusCmd = INS_BEGIN_KM_CMD + 7;
constexpr int kSeFactoryLockCmd = INS_BEGIN_KM_CMD + 10;
constexpr int kOemRootPublicKeyCmd = INS_BEGIN_KM_CMD + 11;
constexpr int kOemUnLockProvisionCmd = INS_BEGIN_KM_CMD + 12;
constexpr int kDeviceUniqueKeyCmd = INS_BEGIN_KM_CMD + 13;
constexpr int kAdditionalCertChainCmd = INS_BEGIN_KM_CMD + 14;
constexpr int kSecureBootModeCmd = INS_BEGIN_KM_CMD + 15;
constexpr int kSecureBootModeCmd = INS_BEGIN_KM_CMD + 18;