diff options
| author | Brian Young <bcyoung@google.com> | 2018-01-29 23:59:28 +0000 |
|---|---|---|
| committer | Ian Pedowitz <ijpedowitz@google.com> | 2018-01-30 15:31:25 +0000 |
| commit | 2a1977b2c383a05c58cda0e773f29c49192e9a4a (patch) | |
| tree | 46b2c0256d48ee74cb7279a9bc33be077d519a08 | |
| parent | d98e6865503ee2c63c4e73796f7ad8b6cb87c450 (diff) | |
| download | keymaster-2a1977b2c383a05c58cda0e773f29c49192e9a4a.tar.gz | |
Revert "Add "Unlocked device required" parameter to keys"
This reverts commit d98e6865503ee2c63c4e73796f7ad8b6cb87c450.
Reason for revert: Build breakages on elfin, gce_x86_phone.
Bug: 72679761
Bug: 67752510
Change-Id: Iaa6b154f1ec4a2095ed5704d7670f8cae0d8c2f7
| -rw-r--r-- | android_keymaster/keymaster_enforcement.cpp | 5 | ||||
| -rw-r--r-- | android_keymaster/keymaster_tags.cpp | 2 | ||||
| -rw-r--r-- | include/keymaster/attestation_record.h | 1 | ||||
| -rw-r--r-- | include/keymaster/keymaster_tags.h | 1 | ||||
| -rw-r--r-- | km_openssl/attestation_record.cpp | 3 |
5 files changed, 0 insertions, 12 deletions
diff --git a/android_keymaster/keymaster_enforcement.cpp b/android_keymaster/keymaster_enforcement.cpp index d62dc62..ccb20f0 100644 --- a/android_keymaster/keymaster_enforcement.cpp +++ b/android_keymaster/keymaster_enforcement.cpp @@ -347,11 +347,6 @@ keymaster_error_t KeymasterEnforcement::AuthorizeBegin(const keymaster_purpose_t case KM_TAG_ALLOW_WHILE_ON_BODY: break; - /* TODO(bcyoung): This is currently handled in keystore, but may move to keymaster in the - * future */ - case KM_TAG_UNLOCKED_DEVICE_REQUIRED: - break; - case KM_TAG_BOOTLOADER_ONLY: return KM_ERROR_INVALID_KEY_BLOB; } diff --git a/android_keymaster/keymaster_tags.cpp b/android_keymaster/keymaster_tags.cpp index 27b67c8..2375389 100644 --- a/android_keymaster/keymaster_tags.cpp +++ b/android_keymaster/keymaster_tags.cpp @@ -109,8 +109,6 @@ const char* StringifyTag(keymaster_tag_t tag) { return "KM_TAG_RESET_SINCE_ID_ROTATION"; case KM_TAG_ALLOW_WHILE_ON_BODY: return "KM_TAG_ALLOW_WHILE_ON_BODY"; - case KM_TAG_UNLOCKED_DEVICE_REQUIRED: - return "KM_TAG_UNLOCKED_DEVICE_REQUIRED"; case KM_TAG_ATTESTATION_CHALLENGE: return "KM_TAG_ATTESTATION_CHALLENGE"; case KM_TAG_ATTESTATION_APPLICATION_ID: diff --git a/include/keymaster/attestation_record.h b/include/keymaster/attestation_record.h index c7facd3..604e391 100644 --- a/include/keymaster/attestation_record.h +++ b/include/keymaster/attestation_record.h @@ -71,7 +71,6 @@ typedef struct km_auth_list { ASN1_INTEGER* user_auth_type; ASN1_INTEGER* auth_timeout; ASN1_NULL* allow_while_on_body; - ASN1_NULL* unlocked_device_required; ASN1_NULL* all_applications; ASN1_OCTET_STRING* application_id; ASN1_INTEGER* creation_date_time; diff --git a/include/keymaster/keymaster_tags.h b/include/keymaster/keymaster_tags.h index 9908119..ad072ec 100644 --- a/include/keymaster/keymaster_tags.h +++ b/include/keymaster/keymaster_tags.h @@ -151,7 +151,6 @@ DECLARE_KEYMASTER_TAG(KM_ULONG_REP, TAG_USER_SECURE_ID); DECLARE_KEYMASTER_TAG(KM_BOOL, TAG_NO_AUTH_REQUIRED); DECLARE_KEYMASTER_TAG(KM_UINT, TAG_AUTH_TIMEOUT); DECLARE_KEYMASTER_TAG(KM_BOOL, TAG_ALLOW_WHILE_ON_BODY); -DECLARE_KEYMASTER_TAG(KM_BOOL, TAG_UNLOCKED_DEVICE_REQUIRED); DECLARE_KEYMASTER_TAG(KM_BOOL, TAG_ALL_APPLICATIONS); DECLARE_KEYMASTER_TAG(KM_BYTES, TAG_APPLICATION_ID); DECLARE_KEYMASTER_TAG(KM_BYTES, TAG_APPLICATION_DATA); diff --git a/km_openssl/attestation_record.cpp b/km_openssl/attestation_record.cpp index 6160c2d..fb61155 100644 --- a/km_openssl/attestation_record.cpp +++ b/km_openssl/attestation_record.cpp @@ -222,9 +222,6 @@ keymaster_error_t build_auth_list(const AuthorizationSet& auth_list, KM_AUTH_LIS case KM_TAG_ALLOW_WHILE_ON_BODY: bool_ptr = &record->allow_while_on_body; break; - case KM_TAG_UNLOCKED_DEVICE_REQUIRED: - bool_ptr = &record->unlocked_device_required; - break; case KM_TAG_CALLER_NONCE: bool_ptr = &record->caller_nonce; break; |