Revert "Restore "Add "Unlocked device required" parameter to keys""

This reverts commit a684cb6c2c.

Reason for revert: Regression in creating auth-bound keys

Bug: 73773914

Bug: 67752510

Change-Id: Ib215d63efe442916f90065015a57614b097cd74d
This commit is contained in:
Brian Young
2018-02-22 23:36:19 +00:00
parent a684cb6c2c
commit 968f997468

View File

@@ -112,8 +112,6 @@ typedef enum {
KM_TAG_ALLOW_WHILE_ON_BODY = KM_BOOL | 506, /* Allow key to be used after authentication timeout 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 * if device is still on-body (requires secure
* on-body sensor. */ * on-body sensor. */
KM_TAG_UNLOCKED_DEVICE_REQUIRED = KM_BOOL | 508, /* Require the device screen to be unlocked if the
* key is used. */
/* Application access control */ /* Application access control */
KM_TAG_ALL_APPLICATIONS = KM_BOOL | 600, /* Specified to indicate key is usable by all KM_TAG_ALL_APPLICATIONS = KM_BOOL | 600, /* Specified to indicate key is usable by all
@@ -454,7 +452,6 @@ typedef enum {
KM_ERROR_KEYMASTER_NOT_CONFIGURED = -64, KM_ERROR_KEYMASTER_NOT_CONFIGURED = -64,
KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING = -65, KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING = -65,
KM_ERROR_CANNOT_ATTEST_IDS = -66, KM_ERROR_CANNOT_ATTEST_IDS = -66,
KM_ERROR_DEVICE_LOCKED = -71,
KM_ERROR_UNIMPLEMENTED = -100, KM_ERROR_UNIMPLEMENTED = -100,
KM_ERROR_VERSION_MISMATCH = -101, KM_ERROR_VERSION_MISMATCH = -101,