This repository was archived by the owner on May 24, 2026. It is now read-only.
Keymaster bug fixes - #131
Merged
mdwivedi merged 4 commits intoMay 19, 2022
Merged
Conversation
Javacard km 41 aosp upmerge 0630
Javacard km 41 aosp upmerge 0630
2. Removed length validation for attestation ids 3. Include CREATION_DATE_TIME in HAL for generate, import and importWrappedKey 4. Updated the hardware enforced and sw enforced paramters in attestataion record.
subrahmanyaman
commented
May 18, 2022
ContributorAuthor
Review comments. |
| @@ -75,11 +75,10 @@ public class KMAttestationCertImpl implements KMAttestationCert { | |||
| private static final short[] swTagIds = { | |||
| KMType.ATTESTATION_APPLICATION_ID, | |||
| KMType.CREATION_DATETIME, | |||
ContributorAuthor
There was a problem hiding this comment.
Do not change the order.
| @@ -90,7 +89,8 @@ public class KMAttestationCertImpl implements KMAttestationCert { | |||
| KMType.ATTESTATION_ID_SERIAL, KMType.ATTESTATION_ID_PRODUCT, | |||
| KMType.ATTESTATION_ID_DEVICE, KMType.ATTESTATION_ID_BRAND, | |||
| KMType.OS_PATCH_LEVEL, KMType.OS_VERSION, KMType.ROOT_OF_TRUST, | |||
ContributorAuthor
There was a problem hiding this comment.
Double check all the attesatation record all the order in both keymint and keymaster.
| public static final short CERT_ISSUER_MAX_SIZE = 250; | ||
| public static final short CERT_EXPIRY_MAX_SIZE = 20; | ||
| public static final short TOTAL_ATTEST_IDS_SIZE = 300; | ||
| // If the size of the attestation ids is known and lesser than 64 |
ContributorAuthor
There was a problem hiding this comment.
This attest ids max size should not change between the upgrades.
| // Send earlyBootEnded if there is any pending earlybootEnded event. | ||
| handleSendEarlyBootEndedEvent(); | ||
| if(!findTag(keyParams, Tag::CREATION_DATETIME) && | ||
| !findTag(keyParams, Tag::ACTIVE_DATETIME)) { |
ContributorAuthor
There was a problem hiding this comment.
Check if CREATION_DATETIME is mandatory .
if (include_unque_id && creation_datetime)
only if neither ACTIVE_DATETIME nor CREATION_DATETIME tags are present.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.