Skip to content

Divegeek 200 attestation version #219

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
mdwivedi merged 2 commits into from
Sep 12, 2022
Merged

Divegeek 200 attestation version #219

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
14f1aa3
Merge pull request #105 from divegeek/Javacard_KeyMint_200_master
subrahmanyaman Aug 24, 2022
180f913
Updated the KeyMint version to 200 in attestation record
subrahmanyaman Aug 31, 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
16 changes: 8 additions & 8 deletions Applet/AndroidSEProvider/src/com/android/javacard/keymaster/KMAttestationCertImpl.java
View file
Open in desktop
Original file line number Diff line number Diff 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 Down Expand 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 number Diff line number Diff 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 Down Expand 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