commit caad59f000270b1c5325f8fedf3d5ce2897e7c15
author Matthew Maurer <mmaurer@google.com> Wed Dec 11 00:07:29 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 11 00:07:29 2019 -0800
tree b6de9b318cbed9e0988d451798ece54a07c8d735
parent fda30476da2d799f21b5c02664a9e1c135b84ecd
parent 6ec7a6f4550cc1b5a0d47e9b123592a9d5bc922d

Merge "Add ROLLBACK_RESISTANCE definition to for KM4"
am: 6ec7a6f455

Change-Id: I49efe8901a9f3bded329bebe9934164f7e94a2e5

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index eca484c..d92ce00 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -75,6 +75,8 @@
     /* 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 @@
     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,