From 64eae5381d14ca1779f8dee6df67e05d693763ff Mon Sep 17 00:00:00 2001 From: Dan Stoza Date: Tue, 25 Apr 2017 17:22:53 +0000 Subject: Revert "Attest device IDs in default keymaster implementation" This reverts commit 16869b93004868b4ae87486357d2b8af793eeaab. Reason for revert: Breaks Ryu build Change-Id: I99d376975077ea731d47454247c97ad1dcccfbc0 --- include/keymaster/keymaster_context.h | 9 --------- include/keymaster/soft_keymaster_context.h | 2 -- 2 files changed, 11 deletions(-) (limited to 'include/keymaster') 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. -- cgit v1.2.3