diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-22 04:24:46 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-22 04:24:46 +0000 |
| commit | 82511a0a41c8f7223f7731cdad3016ad1252c893 (patch) | |
| tree | 5911209a2d1b200b5bf66534637fde0887809ab5 | |
| parent | 16a69e94ea661028a45650b576143c1bdb5d0e4c (diff) | |
| parent | df2f2301a30e236853a69d34ff4082f9e19ab7e2 (diff) | |
| download | libhardware-82511a0a41c8f7223f7731cdad3016ad1252c893.tar.gz | |
Snap for 6152176 from df2f2301a30e236853a69d34ff4082f9e19ab7e2 to rvc-release
Change-Id: I085f92431e5665e0b481648fdaec42b004fe54c1
| -rw-r--r-- | include/hardware/keymaster_defs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index eca484cd..d92ce007 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -75,6 +75,8 @@ typedef enum { /* Other hardware-enforced. */ KM_TAG_BLOB_USAGE_REQUIREMENTS = KM_ENUM | 301, /* keymaster_key_blob_usage_requirements_t */ KM_TAG_BOOTLOADER_ONLY = KM_BOOL | 302, /* Usable only by bootloader */ + KM_TAG_ROLLBACK_RESISTANCE = KM_BOOL | 303, /* Hardware enforced deletion with deleteKey + * or deleteAllKeys is supported */ /* * Tags that should be semantically enforced by hardware if possible and will otherwise be @@ -456,6 +458,7 @@ typedef enum { KM_ERROR_KEYMASTER_NOT_CONFIGURED = -64, KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING = -65, KM_ERROR_CANNOT_ATTEST_IDS = -66, + KM_ERROR_ROLLBACK_RESISTANCE_UNAVAILABLE = -67, KM_ERROR_NO_USER_CONFIRMATION = -71, KM_ERROR_DEVICE_LOCKED = -72, |