diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-02-08 18:36:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-08 18:36:22 +0000 |
| commit | 7ca23cbbca1b938e05b1b4ab1eab532c346460ad (patch) | |
| tree | ab7d716c98314ab77151e7800123baded50ff119 | |
| parent | 06352d39ea399434870fba7d99e4847213e08164 (diff) | |
| parent | 70ded94cf6570af7835d6b0f7229dc344c188c8d (diff) | |
| download | libhardware-7ca23cbbca1b938e05b1b4ab1eab532c346460ad.tar.gz | |
Merge "Keymint: Add CERTIFICATE_* tags" am: ead6cd16d8 am: 864b71f5ff am: 381ce9a86a am: 70ded94cf6
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566355
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35aec1237d0adc19f3daf0f17659ef5261d33d3c
| -rw-r--r-- | include/hardware/keymaster_defs.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index a0a1c8e5..f6223ffb 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -193,7 +193,7 @@ typedef enum { proving that the user confirmed a signing request. */ - KM_TAG_CERTIFICATE_SERIAL = KM_UINT | 1006, /* The serial number that should be + KM_TAG_CERTIFICATE_SERIAL = KM_BIGNUM | 1006, /* The serial number that should be set in the attestation certificate to be generated. */ @@ -201,6 +201,18 @@ typedef enum { set in the attestation certificate to be generated. */ + KM_TAG_CERTIFICATE_NOT_BEFORE = KM_DATE | 1008, /* Epoch time in milliseconds of the start of + the to be generated certificate's validity. + The value should interpreted as too's + complement signed integer. Negative values + indicate dates before Jan 1970 */ + + KM_TAG_CERTIFICATE_NOT_AFTER = KM_DATE | 1009, /* Epoch time in milliseconds of the end of + the to be generated certificate's validity. + The value should interpreted as too's + complement signed integer. Negative values + indicate dates before Jan 1970 */ + } keymaster_tag_t; @@ -496,6 +508,8 @@ typedef enum { KM_ERROR_ATTESTATION_IDS_NOT_PROVISIONED = -75, KM_ERROR_INCOMPATIBLE_MGF_DIGEST = -78, KM_ERROR_UNSUPPORTED_MGF_DIGEST = -79, + KM_ERROR_MISSING_NOT_BEFORE = -80, + KM_ERROR_MISSING_NOT_AFTER = -81, KM_ERROR_UNIMPLEMENTED = -100, KM_ERROR_VERSION_MISMATCH = -101, |