Index: chromeos/attestation/attestation_flow.cc |
diff --git a/chromeos/attestation/attestation_flow.cc b/chromeos/attestation/attestation_flow.cc |
index 9b22b659f54f6c934441eef92b50b040420bfa0b..17b5e7a036e752bc62caf877e2f6b65cbe94127f 100644 |
--- a/chromeos/attestation/attestation_flow.cc |
+++ b/chromeos/attestation/attestation_flow.cc |
@@ -207,6 +207,7 @@ void AttestationFlow::StartCertificateRequest( |
base::Bind(&AttestationFlow::SendCertificateRequestToPCA, |
weak_factory_.GetWeakPtr(), |
key_type, |
+ user_email, |
key_name, |
callback)); |
} else { |
@@ -215,6 +216,7 @@ void AttestationFlow::StartCertificateRequest( |
&AttestationFlow::GetExistingCertificate, |
weak_factory_.GetWeakPtr(), |
key_type, |
+ user_email, |
key_name, |
callback); |
// If the key does not exist, call this method back with |generate_new_key| |
@@ -229,6 +231,7 @@ void AttestationFlow::StartCertificateRequest( |
callback); |
cryptohome_client_->TpmAttestationDoesKeyExist( |
key_type, |
+ user_email, |
key_name, |
base::Bind(&DBusBoolRedirectCallback, |
on_key_exists, |
@@ -239,6 +242,7 @@ void AttestationFlow::StartCertificateRequest( |
void AttestationFlow::SendCertificateRequestToPCA( |
AttestationKeyType key_type, |
+ const std::string& user_email, |
const std::string& key_name, |
const CertificateCallback& callback, |
bool success, |
@@ -256,12 +260,14 @@ void AttestationFlow::SendCertificateRequestToPCA( |
base::Bind(&AttestationFlow::SendCertificateResponseToDaemon, |
weak_factory_.GetWeakPtr(), |
key_type, |
+ user_email, |
key_name, |
callback)); |
} |
void AttestationFlow::SendCertificateResponseToDaemon( |
AttestationKeyType key_type, |
+ const std::string& user_email, |
const std::string& key_name, |
const CertificateCallback& callback, |
bool success, |
@@ -276,16 +282,19 @@ void AttestationFlow::SendCertificateResponseToDaemon( |
// Forward the response to the attestation service to complete the operation. |
async_caller_->AsyncTpmAttestationFinishCertRequest(data, |
key_type, |
+ user_email, |
key_name, |
base::Bind(callback)); |
} |
void AttestationFlow::GetExistingCertificate( |
AttestationKeyType key_type, |
+ const std::string& user_email, |
const std::string& key_name, |
const CertificateCallback& callback) { |
cryptohome_client_->TpmAttestationGetCertificate( |
key_type, |
+ user_email, |
key_name, |
base::Bind(&DBusDataMethodCallback, callback)); |
} |