summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Crowley <paulcrowley@google.com>2021-02-27 07:25:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-27 07:25:36 +0000
commite92e08a8a47cf8c7d900444ac411d79b74b88332 (patch)
treeabe1993120c64baf4425182803e3d1860ee6cef8
parent706a6ab36d2d370cda2f54f2a86a08626908e4d7 (diff)
parent43972e7d10362e20f3b1cfc53e2ccbe2775125c7 (diff)
downloadlibhardware-e92e08a8a47cf8c7d900444ac411d79b74b88332.tar.gz
Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I26af986c4429e48c6ec492c8bf32a34931e9e585
-rw-r--r--include/hardware/keymaster_defs.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 49f65a9a..c0b3800e 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -212,8 +212,8 @@ typedef enum {
The value should interpreted as too's
complement signed integer. Negative values
indicate dates before Jan 1970 */
-
-
+ KM_TAG_MAX_BOOT_LEVEL = KM_UINT | 1010, /* Specifies a maximum boot level at which a key
+ should function. */
} keymaster_tag_t;
/**
@@ -512,6 +512,7 @@ typedef enum {
KM_ERROR_MISSING_NOT_AFTER = -81,
KM_ERROR_MISSING_ISSUER_SUBJECT = -82,
KM_ERROR_INVALID_ISSUER_SUBJECT = -83,
+ KM_ERROR_BOOT_LEVEL_EXCEEDED = -84,
KM_ERROR_UNIMPLEMENTED = -100,
KM_ERROR_VERSION_MISMATCH = -101,