tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10 am: e92e08a8a4 am: 62b0336ba4 am: 248ac03b14

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c45a3961cb0c736e8ebe00e563627d0c16f43e3
This commit is contained in:
Paul Crowley 2021-03-01 09:05:26 +00:00 committed by Automerger Merge Worker
commit 3ce0965b3f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/hardware/keymaster_defs.h
View file

@ -212,8 +212,8 @@ typedef enum {
The value should interpreted as too's The value should interpreted as too's
complement signed integer. Negative values complement signed integer. Negative values
indicate dates before Jan 1970 */ 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; } keymaster_tag_t;
/** /**
@ -512,6 +512,7 @@ typedef enum {
KM_ERROR_MISSING_NOT_AFTER = -81, KM_ERROR_MISSING_NOT_AFTER = -81,
KM_ERROR_MISSING_ISSUER_SUBJECT = -82, KM_ERROR_MISSING_ISSUER_SUBJECT = -82,
KM_ERROR_INVALID_ISSUER_SUBJECT = -83, KM_ERROR_INVALID_ISSUER_SUBJECT = -83,
KM_ERROR_BOOT_LEVEL_EXCEEDED = -84,
KM_ERROR_UNIMPLEMENTED = -100, KM_ERROR_UNIMPLEMENTED = -100,
KM_ERROR_VERSION_MISMATCH = -101, KM_ERROR_VERSION_MISMATCH = -101,