Skip to content

KM200: Merge the latest changes from AOSP to GitHub#143

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 1 commit into from
Oct 9, 2023
Merged

KM200: Merge the latest changes from AOSP to GitHub #143

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
17 changes: 4 additions & 13 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@@ -245,8 +245,8 @@ private KMAttestationCert uniqueId(short obj) {
@Override
public KMAttestationCert notBefore(short obj, boolean derEncoded, byte[] scratchpad) {
if (!derEncoded) {
// convert milliseconds to UTC date
indexes[NOT_BEFORE] = KMUtils.convertToDate(obj, scratchpad, true);
// convert milliseconds to UTC / Generalized time format
indexes[NOT_BEFORE] = KMUtils.convertToDate(obj, scratchpad);
} else {
indexes[NOT_BEFORE] =
KMByteBlob.instance(
Expand All@@ -262,17 +262,8 @@ public KMAttestationCert notAfter(
short usageExpiryTimeObj, boolean derEncoded, byte[] scratchPad) {
if (!derEncoded) {
if (usageExpiryTimeObj != KMType.INVALID_VALUE) {
// compare if the expiry time is greater then 2050 then use generalized
// time format else use utc time format.
short tmpVar = KMInteger.uint_64(KMUtils.firstJan2050, (short) 0);
if (KMInteger.compare(usageExpiryTimeObj, tmpVar) >= 0) {
usageExpiryTimeObj = KMUtils.convertToDate(usageExpiryTimeObj, scratchPad, false);
} else {
usageExpiryTimeObj = KMUtils.convertToDate(usageExpiryTimeObj, scratchPad, true);
}
indexes[NOT_AFTER] = usageExpiryTimeObj;
} else {
// notAfter = certExpirtyTimeObj;
// convert milliseconds to UTC / Generalized time format
indexes[NOT_AFTER] = KMUtils.convertToDate(usageExpiryTimeObj, scratchPad);
}
} else {
indexes[NOT_AFTER] = usageExpiryTimeObj;
Expand Down
1 change: 0 additions & 1 deletion Applet/AndroidSEProvider/src/com/android/javacard/keymaster/KMConfigurations.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,5 @@ public class KMConfigurations {
// If the size of the attestation ids is known and lesser than 64
// then reduce the size here. It reduces the heap memory usage.
public static final byte MAX_ATTESTATION_IDS_SIZE = 64;
// DER subject max length.
public static final short MAX_SUBJECT_DER_LEN = 1095;
}
284 changes: 136 additions & 148 deletions Applet/AndroidSEProvider/src/com/android/javacard/keymaster/KMUtils.java
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 4 additions & 13 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@@ -256,8 +256,8 @@ private KMAttestationCert uniqueId(short obj) {
@Override
public KMAttestationCert notBefore(short obj, boolean derEncoded, byte[] scratchpad) {
if (!derEncoded) {
// convert milliseconds to UTC date
indexes[NOT_BEFORE] = KMUtils.convertToDate(obj, scratchpad, true);
// convert milliseconds to UTC / Generalized time format
indexes[NOT_BEFORE] = KMUtils.convertToDate(obj, scratchpad);
} else {
indexes[NOT_BEFORE] =
KMByteBlob.instance(
Expand All@@ -273,17 +273,8 @@ public KMAttestationCert notAfter(
short usageExpiryTimeObj, boolean derEncoded, byte[] scratchPad) {
if (!derEncoded) {
if (usageExpiryTimeObj != KMType.INVALID_VALUE) {
// compare if the expiry time is greater then 2050 then use generalized
// time format else use utc time format.
short tmpVar = KMInteger.uint_64(KMUtils.firstJan2050, (short) 0);
if (KMInteger.compare(usageExpiryTimeObj, tmpVar) >= 0) {
usageExpiryTimeObj = KMUtils.convertToDate(usageExpiryTimeObj, scratchPad, false);
} else {
usageExpiryTimeObj = KMUtils.convertToDate(usageExpiryTimeObj, scratchPad, true);
}
indexes[NOT_AFTER] = usageExpiryTimeObj;
} else {
// notAfter = certExpirtyTimeObj;
// convert milliseconds to UTC / Generalized time format
indexes[NOT_AFTER] = KMUtils.convertToDate(usageExpiryTimeObj, scratchPad);
}
} else {
indexes[NOT_AFTER] = usageExpiryTimeObj;
Expand Down
Loading