summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-02-09 02:06:50 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-02-09 02:06:50 +0000
commitf06aaa08ccecd83417d0d117a27e4f82067fa084 (patch)
treeab7d716c98314ab77151e7800123baded50ff119
parent55d89cba687f34264c689a46c5bec026285a125e (diff)
parent70ded94cf6570af7835d6b0f7229dc344c188c8d (diff)
downloadlibhardware-f06aaa08ccecd83417d0d117a27e4f82067fa084.tar.gz
Snap for 7133097 from 70ded94cf6570af7835d6b0f7229dc344c188c8d to sc-d1-release
Change-Id: I24b72b86b87084fdbdd6d49f9a86585004fc017c
-rw-r--r--include/hardware/keymaster_defs.h16
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,