Commit 8c2c507f authored by Leo Lai's avatar Leo Lai Committed by Commit Bot

remove TpmAttestationGetEnrollmentId APIs

Now we are using AttestationClient directly instead of passing through
CryptohomeClient.

BUG=b:158955123
TEST=build ok.

Change-Id: I0275f2ee7515dd907c13f3fdfb0e9ca2da23e3d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2497391
Commit-Queue: Leo Lai <cylai@google.com>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821277}
parent 54e29ca2
...@@ -481,21 +481,6 @@ class CryptohomeClientImpl : public CryptohomeClient { ...@@ -481,21 +481,6 @@ class CryptohomeClientImpl : public CryptohomeClient {
return CallBoolMethodAndBlock(&method_call, is_first_install); return CallBoolMethodAndBlock(&method_call, is_first_install);
} }
// CryptohomeClient override.
void TpmAttestationGetEnrollmentId(
bool ignore_cache,
DBusMethodCallback<TpmAttestationDataResult> callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmAttestationGetEnrollmentId);
dbus::MessageWriter writer(&method_call);
writer.AppendBool(ignore_cache);
proxy_->CallMethod(
&method_call, kTpmDBusTimeoutMs,
base::BindOnce(&CryptohomeClientImpl::OnTpmAttestationDataMethod,
weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
}
// CryptohomeClient override. // CryptohomeClient override.
void TpmAttestationIsEnrolled(DBusMethodCallback<bool> callback) override { void TpmAttestationIsEnrolled(DBusMethodCallback<bool> callback) override {
dbus::MethodCall method_call( dbus::MethodCall method_call(
......
...@@ -316,13 +316,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) CryptohomeClient { ...@@ -316,13 +316,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) CryptohomeClient {
// succeeds. This method blocks until the call returns. // succeeds. This method blocks until the call returns.
virtual bool InstallAttributesIsFirstInstall(bool* is_first_install) = 0; virtual bool InstallAttributesIsFirstInstall(bool* is_first_install) = 0;
// Requests the device's enrollment identifier (EID). The |callback| will be
// called with the EID. If |ignore_cache| is true, the EID is calculated
// even if the attestation database already contains a cached version.
virtual void TpmAttestationGetEnrollmentId(
bool ignore_cache,
DBusMethodCallback<TpmAttestationDataResult> callback) = 0;
// Calls the TpmAttestationIsEnrolled dbus method. The callback is called // Calls the TpmAttestationIsEnrolled dbus method. The callback is called
// when the operation completes. // when the operation completes.
virtual void TpmAttestationIsEnrolled(DBusMethodCallback<bool> callback) = 0; virtual void TpmAttestationIsEnrolled(DBusMethodCallback<bool> callback) = 0;
......
...@@ -332,19 +332,6 @@ bool FakeCryptohomeClient::InstallAttributesIsFirstInstall( ...@@ -332,19 +332,6 @@ bool FakeCryptohomeClient::InstallAttributesIsFirstInstall(
return true; return true;
} }
void FakeCryptohomeClient::TpmAttestationGetEnrollmentId(
bool ignore_cache,
DBusMethodCallback<TpmAttestationDataResult> callback) {
auto result =
service_is_available_
? base::make_optional(TpmAttestationDataResult{
true, ignore_cache ? tpm_attestation_enrollment_id_ignore_cache_
: tpm_attestation_enrollment_id_})
: base::nullopt;
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(std::move(callback), result));
}
void FakeCryptohomeClient::TpmAttestationIsEnrolled( void FakeCryptohomeClient::TpmAttestationIsEnrolled(
DBusMethodCallback<bool> callback) { DBusMethodCallback<bool> callback) {
auto result = service_is_available_ auto result = service_is_available_
......
...@@ -99,9 +99,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient ...@@ -99,9 +99,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient
void InstallAttributesIsReady(DBusMethodCallback<bool> callback) override; void InstallAttributesIsReady(DBusMethodCallback<bool> callback) override;
bool InstallAttributesIsInvalid(bool* is_invalid) override; bool InstallAttributesIsInvalid(bool* is_invalid) override;
bool InstallAttributesIsFirstInstall(bool* is_first_install) override; bool InstallAttributesIsFirstInstall(bool* is_first_install) override;
void TpmAttestationGetEnrollmentId(
bool ignore_cache,
DBusMethodCallback<TpmAttestationDataResult> callback) override;
void TpmAttestationIsEnrolled(DBusMethodCallback<bool> callback) override; void TpmAttestationIsEnrolled(DBusMethodCallback<bool> callback) override;
void AsyncTpmAttestationCreateEnrollRequest( void AsyncTpmAttestationCreateEnrollRequest(
chromeos::attestation::PrivacyCAType pca_type, chromeos::attestation::PrivacyCAType pca_type,
...@@ -303,15 +300,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient ...@@ -303,15 +300,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient
cryptohome_error_ = error; cryptohome_error_ = error;
} }
void set_tpm_attestation_enrollment_id(bool ignore_cache,
const std::string& eid) {
if (ignore_cache) {
tpm_attestation_enrollment_id_ignore_cache_ = eid;
} else {
tpm_attestation_enrollment_id_ = eid;
}
}
void set_tpm_attestation_is_enrolled(bool enrolled) { void set_tpm_attestation_is_enrolled(bool enrolled) {
tpm_attestation_is_enrolled_ = enrolled; tpm_attestation_is_enrolled_ = enrolled;
} }
...@@ -482,10 +470,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient ...@@ -482,10 +470,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient
bool needs_dircrypto_migration_ = false; bool needs_dircrypto_migration_ = false;
bool run_default_dircrypto_migration_ = true; bool run_default_dircrypto_migration_ = true;
std::string tpm_attestation_enrollment_id_ignore_cache_ =
"6fcc0ebddec3db95cdcf82476d594f4d60db934c5b47fa6085c707b2a93e205b";
std::string tpm_attestation_enrollment_id_ =
"6fcc0ebddec3db95cdcf82476d594f4d60db934c5b47fa6085c707b2a93e205b";
bool tpm_attestation_is_enrolled_ = true; bool tpm_attestation_is_enrolled_ = true;
bool tpm_attestation_does_key_exist_should_succeed_ = true; bool tpm_attestation_does_key_exist_should_succeed_ = true;
bool supports_low_entropy_credentials_ = false; bool supports_low_entropy_credentials_ = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment