chromeos/dbus/cryptohome_client.cc - Issue 27044004: Added multi-profile support for attestation on chromeos.

Unified Diff: chromeos/dbus/cryptohome_client.cc

Issue 27044004: Added multi-profile support for attestation on chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Added OWNERS Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chromeos/dbus/cryptohome_client.cc

diff --git a/chromeos/dbus/cryptohome_client.cc b/chromeos/dbus/cryptohome_client.cc

index 86133aea627567cc6da48079400878bb8d489708..93aefc755adc9aba24117437233a3bb173420075 100644

--- a/chromeos/dbus/cryptohome_client.cc

+++ b/chromeos/dbus/cryptohome_client.cc

@@ -484,6 +484,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

virtual void AsyncTpmAttestationFinishCertRequest(

const std::string& pca_response,

attestation::AttestationKeyType key_type,

+ const std::string& user_email,

const std::string& key_name,

const AsyncMethodCallback& callback) OVERRIDE {

dbus::MethodCall method_call(

@@ -495,6 +496,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

pca_response.size());

bool is_user_specific = (key_type == attestation::KEY_USER);

writer.AppendBool(is_user_specific);

+ writer.AppendString(user_email);

writer.AppendString(key_name);

proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,

base::Bind(&CryptohomeClientImpl::OnAsyncMethodCall,

@@ -505,6 +507,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

// CryptohomeClient override.

virtual void TpmAttestationDoesKeyExist(

attestation::AttestationKeyType key_type,

+ const std::string& user_email,

const std::string& key_name,

const BoolDBusMethodCallback& callback) OVERRIDE {

dbus::MethodCall method_call(

@@ -513,6 +516,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

dbus::MessageWriter writer(&method_call);

bool is_user_specific = (key_type == attestation::KEY_USER);

writer.AppendBool(is_user_specific);

+ writer.AppendString(user_email);

writer.AppendString(key_name);

CallBoolMethod(&method_call, callback);

}

@@ -520,6 +524,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

// CryptohomeClient override.

virtual void TpmAttestationGetCertificate(

attestation::AttestationKeyType key_type,

+ const std::string& user_email,

const std::string& key_name,

const DataMethodCallback& callback) OVERRIDE {

dbus::MethodCall method_call(

@@ -528,6 +533,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

dbus::MessageWriter writer(&method_call);

bool is_user_specific = (key_type == attestation::KEY_USER);

writer.AppendBool(is_user_specific);

+ writer.AppendString(user_email);

writer.AppendString(key_name);

proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,

base::Bind(&CryptohomeClientImpl::OnDataMethod,

@@ -538,6 +544,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

// CryptohomeClient override.

virtual void TpmAttestationGetPublicKey(

attestation::AttestationKeyType key_type,

+ const std::string& user_email,

const std::string& key_name,

const DataMethodCallback& callback) OVERRIDE {

dbus::MethodCall method_call(

@@ -546,6 +553,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

dbus::MessageWriter writer(&method_call);

bool is_user_specific = (key_type == attestation::KEY_USER);

writer.AppendBool(is_user_specific);

+ writer.AppendString(user_email);

writer.AppendString(key_name);

proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,

base::Bind(&CryptohomeClientImpl::OnDataMethod,

@@ -556,6 +564,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

// CryptohomeClient override.

virtual void TpmAttestationRegisterKey(

attestation::AttestationKeyType key_type,

+ const std::string& user_email,

const std::string& key_name,

const AsyncMethodCallback& callback) OVERRIDE {

dbus::MethodCall method_call(

@@ -564,6 +573,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

dbus::MessageWriter writer(&method_call);

bool is_user_specific = (key_type == attestation::KEY_USER);

writer.AppendBool(is_user_specific);

+ writer.AppendString(user_email);

writer.AppendString(key_name);

proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,

base::Bind(&CryptohomeClientImpl::OnAsyncMethodCall,

@@ -574,6 +584,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

// CryptohomeClient override.

virtual void TpmAttestationSignEnterpriseChallenge(

attestation::AttestationKeyType key_type,

+ const std::string& user_email,

const std::string& key_name,

const std::string& domain,

const std::string& device_id,

@@ -586,6 +597,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

dbus::MessageWriter writer(&method_call);

bool is_user_specific = (key_type == attestation::KEY_USER);

writer.AppendBool(is_user_specific);

+ writer.AppendString(user_email);

writer.AppendString(key_name);

writer.AppendString(domain);

writer.AppendArrayOfBytes(reinterpret_cast<const uint8*>(device_id.data()),

@@ -604,6 +616,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

// CryptohomeClient override.

virtual void TpmAttestationSignSimpleChallenge(

attestation::AttestationKeyType key_type,

+ const std::string& user_email,

const std::string& key_name,

const std::string& challenge,

const AsyncMethodCallback& callback) OVERRIDE {

@@ -613,6 +626,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

dbus::MessageWriter writer(&method_call);

bool is_user_specific = (key_type == attestation::KEY_USER);

writer.AppendBool(is_user_specific);

+ writer.AppendString(user_email);

writer.AppendString(key_name);

writer.AppendArrayOfBytes(reinterpret_cast<const uint8*>(challenge.data()),

challenge.size());

@@ -625,6 +639,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

// CryptohomeClient override.

virtual void TpmAttestationGetKeyPayload(

attestation::AttestationKeyType key_type,

+ const std::string& user_email,

const std::string& key_name,

const DataMethodCallback& callback) OVERRIDE {

dbus::MethodCall method_call(

@@ -633,6 +648,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

dbus::MessageWriter writer(&method_call);

bool is_user_specific = (key_type == attestation::KEY_USER);

writer.AppendBool(is_user_specific);

+ writer.AppendString(user_email);

writer.AppendString(key_name);

proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,

base::Bind(&CryptohomeClientImpl::OnDataMethod,

@@ -643,6 +659,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

// CryptohomeClient override.

virtual void TpmAttestationSetKeyPayload(

attestation::AttestationKeyType key_type,

+ const std::string& user_email,

const std::string& key_name,

const std::string& payload,

const BoolDBusMethodCallback& callback) OVERRIDE {

@@ -652,6 +669,7 @@ class CryptohomeClientImpl : public CryptohomeClient {

dbus::MessageWriter writer(&method_call);

bool is_user_specific = (key_type == attestation::KEY_USER);

writer.AppendBool(is_user_specific);

+ writer.AppendString(user_email);

writer.AppendString(key_name);

writer.AppendArrayOfBytes(reinterpret_cast<const uint8*>(payload.data()),

payload.size());

« chromeos/dbus/cryptohome_client.h ('K') | « chromeos/dbus/cryptohome_client.h ('k') | chromeos/dbus/fake_cryptohome_client.h » ('j') | no next file with comments »