commit db8dc4a65ee6599300eca300642853e5affdf752
author Randall Huang <huangrandall@google.com> Wed Dec 11 09:50:42 2019 +0000
committer Rafal Slawik <rslawik@google.com> Wed Dec 11 11:16:46 2019 +0000
tree f5ba1816b2dac674e64247a32160a63d5678bb87
parent 2d43551bb1dab2868019e7af092aabf7de8c2a63

Revert submission

Reason for revert: 146032426

Bug: 146032426
Change-Id: I95e2d4ea78de8f318e8da13e9400722087054faa
(cherry picked from commit b1c4e2dd9f031a9b42b63af2b176b67f69db4b78)

include/hardware/keymaster_defs.h

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