chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc - Issue 14305009: Enhanced and refactored the AttestationFlow interface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc

Issue 14305009: Enhanced and refactored the AttestationFlow interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 8 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

« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_browsertest.cc ('k') | chromeos/attestation/attestation_constants.h » ('j') | chromeos/attestation/attestation_constants.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc

diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc

index 336dbf63c40e28363ebf2ee4dadd8db81fabe895..6ea9f17139d569e37d4bd12ab99239fe2f73f915 100644

--- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc

+++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc

@@ -129,11 +129,11 @@ void EPKPChallengeMachineKey::GetDeviceAttestationEnabledCallback(

// Everything is checked. Sign the challenge.

async_caller_->TpmAttestationSignEnterpriseChallenge(

- chromeos::CryptohomeClient::DEVICE_KEY,

+ chromeos::attestation::DEVICE_KEY,

kKeyName,

GetEnterpriseDomain(),

GetDeviceId(),

- chromeos::CryptohomeClient::CHALLENGE_RESPONSE_OPTION_NONE,

+ chromeos::attestation::CHALLENGE_RESPONSE_OPTION_NONE,

challenge,

base::Bind(&EPKPChallengeMachineKey::SignChallengeCallback, this));

}

@@ -255,12 +255,12 @@ void EPKPChallengeUserKey::UserConsentCallback(const std::string& challenge,

// Everything is checked. Sign the challenge.

async_caller_->TpmAttestationSignEnterpriseChallenge(

- chromeos::CryptohomeClient::USER_KEY,

+ chromeos::attestation::USER_KEY,

kKeyName,

domain,

GetDeviceId(),

- register_key ? chromeos::CryptohomeClient::INCLUDE_SIGNED_PUBLIC_KEY :

- chromeos::CryptohomeClient::CHALLENGE_RESPONSE_OPTION_NONE,

+ register_key ? chromeos::attestation::INCLUDE_SIGNED_PUBLIC_KEY :

+ chromeos::attestation::CHALLENGE_RESPONSE_OPTION_NONE,

challenge,

base::Bind(&EPKPChallengeUserKey::SignChallengeCallback, this,

register_key));

@@ -277,7 +277,7 @@ void EPKPChallengeUserKey::SignChallengeCallback(bool register_key,

if (register_key) {

async_caller_->TpmAttestationRegisterKey(

- chromeos::CryptohomeClient::USER_KEY,

+ chromeos::attestation::USER_KEY,

kKeyName,

base::Bind(&EPKPChallengeUserKey::RegisterKeyCallback, this, response));

} else {