diff options
| author | Paul Crowley <paulcrowley@google.com> | 2021-02-27 08:23:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-27 08:23:13 +0000 |
| commit | 62b0336ba4b2b7439c6f44ef602f2d3d0d6b8820 (patch) | |
| tree | abe1993120c64baf4425182803e3d1860ee6cef8 | |
| parent | fb880b4133966de7d7cac86436bc40706cd5257f (diff) | |
| parent | e92e08a8a47cf8c7d900444ac411d79b74b88332 (diff) | |
| download | libhardware-62b0336ba4b2b7439c6f44ef602f2d3d0d6b8820.tar.gz | |
Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10 am: e92e08a8a4
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I93ac1f32ccc574893cd961d453c4b699b843e5e2
| -rw-r--r-- | include/hardware/keymaster_defs.h | 5 |
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, |