diff options
| author | Matthew Maurer <mmaurer@google.com> | 2019-04-03 10:46:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-03 10:46:53 -0700 |
| commit | f79d5f4dbe105b5a233847f7f3dc76d3ba8f08ff (patch) | |
| tree | 0e2813e595dcc040c0af269516e333c3c81ca710 | |
| parent | 654acbee66063ce8d6e2acf946b9012d64ea487c (diff) | |
| parent | 9c5b803a88c762ba3125c8c73a6b5915755b93b8 (diff) | |
| download | libhardware-f79d5f4dbe105b5a233847f7f3dc76d3ba8f08ff.tar.gz | |
Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED" am: c559ff3937 am: c58c139801
am: 9c5b803a88
Change-Id: I044188282872292fc745bf85b4e3ca8126ce8a43
| -rw-r--r-- | include/hardware/keymaster_defs.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index 196062ee..eca484cd 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -112,7 +112,9 @@ typedef enum { KM_TAG_ALLOW_WHILE_ON_BODY = KM_BOOL | 506, /* Allow key to be used after authentication timeout * if device is still on-body (requires secure * on-body sensor. */ - KM_TAG_UNLOCKED_DEVICE_REQUIRED = KM_BOOL | 508, /* Require the device screen to be unlocked if the + KM_TAG_TRUSTED_CONFIRMATION_REQUIRED = KM_BOOL | 508, /* Require user confirmation through a + * trusted UI to use this key */ + KM_TAG_UNLOCKED_DEVICE_REQUIRED = KM_BOOL | 509, /* Require the device screen to be unlocked if the * key is used. */ /* Application access control */ @@ -454,6 +456,7 @@ typedef enum { KM_ERROR_KEYMASTER_NOT_CONFIGURED = -64, KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING = -65, KM_ERROR_CANNOT_ATTEST_IDS = -66, + KM_ERROR_NO_USER_CONFIRMATION = -71, KM_ERROR_DEVICE_LOCKED = -72, KM_ERROR_UNIMPLEMENTED = -100, |