diff options
| author | Dan Stoza <stoza@google.com> | 2017-04-25 20:02:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-25 20:02:42 +0000 |
| commit | 75b7ed3aab781e0d591b00fc005eb681f5f01227 (patch) | |
| tree | f43e3d8f7d7ae45bc50a319bb351b13a85d1917c /include/keymaster | |
| parent | 15d526ba94da0da75179c3ff142e0468ed1da19a (diff) | |
| parent | 64eae5381d14ca1779f8dee6df67e05d693763ff (diff) | |
| download | android_system_keymaster-75b7ed3aab781e0d591b00fc005eb681f5f01227.tar.gz android_system_keymaster-75b7ed3aab781e0d591b00fc005eb681f5f01227.tar.bz2 android_system_keymaster-75b7ed3aab781e0d591b00fc005eb681f5f01227.zip | |
Revert "Attest device IDs in default keymaster implementation"
am: 64eae5381d
Change-Id: I9dd557a1acbc865f2a284a4ead74468a3a54d63f
Diffstat (limited to 'include/keymaster')
| -rw-r--r-- | include/keymaster/keymaster_context.h | 9 | ||||
| -rw-r--r-- | include/keymaster/soft_keymaster_context.h | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/include/keymaster/keymaster_context.h b/include/keymaster/keymaster_context.h index 40b1c82..1f28efd 100644 --- a/include/keymaster/keymaster_context.h +++ b/include/keymaster/keymaster_context.h @@ -181,15 +181,6 @@ class KeymasterContext { bool reset_since_rotation, Buffer* unique_id) const = 0; - /** - * Verify that the device IDs provided in the attestation_params match the device's actual IDs - * and copy them to attestation. If *any* of the IDs do not match or verification is not - * possible, return KM_ERROR_CANNOT_ATTEST_IDS. If *all* IDs provided are successfully verified - * or no IDs were provided, return KM_ERROR_OK. - */ - virtual keymaster_error_t VerifyAndCopyDeviceIds(const AuthorizationSet& attestation_params, - AuthorizationSet* attestation) const = 0; - private: // Uncopyable. KeymasterContext(const KeymasterContext&); diff --git a/include/keymaster/soft_keymaster_context.h b/include/keymaster/soft_keymaster_context.h index befb00b..eb10f44 100644 --- a/include/keymaster/soft_keymaster_context.h +++ b/include/keymaster/soft_keymaster_context.h @@ -87,8 +87,6 @@ class SoftKeymasterContext : public KeymasterContext { keymaster_error_t GenerateUniqueId(uint64_t creation_date_time, const keymaster_blob_t& application_id, bool reset_since_rotation, Buffer* unique_id) const override; - keymaster_error_t VerifyAndCopyDeviceIds(const AuthorizationSet& attestation_params, - AuthorizationSet* attestation) const override; KeymasterEnforcement* enforcement_policy() override { // SoftKeymaster does no enforcement; it's all done by Keystore. |