Added multi-profile support for attestation on chromeos.

chromeos/cryptohome/async_method_caller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_
 #define CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 112 matching lines @@
       chromeos::attestation::AttestationCertificateProfile certificate_profile,
       const std::string& user_email,
       const std::string& request_origin,
       const DataCallback& callback) = 0;
 
   // Asks cryptohomed to asynchronously finish an attestation certificate
   // request.  On success the data sent to |callback| is a certificate chain
   // in PEM format.  |pca_response| is the response to the certificate request
   // emitted by the Privacy CA.  |key_type| determines whether the certified key
   // is to be associated with the current user.  |key_name| is a name for the
-  // key.
+  // key.  If |key_type| is KEY_USER, the user's canonical email address must be
+  // provided in |user_email|.  Otherwise |user_email| is ignored.
   virtual void AsyncTpmAttestationFinishCertRequest(
       const std::string& pca_response,
       chromeos::attestation::AttestationKeyType key_type,
+      const std::string& user_email,

[bartfab (slow), 2013/10/13 16:31:35]

As in the other files, please use user_id.

[Darren Krahn, 2013/10/15 16:49:06]

Done.

       const std::string& key_name,
       const DataCallback& callback) = 0;
 
   // Asks cryptohomed to asynchronously register the attestation key specified
-  // by |key_type| and |key_name|.
+  // by |key_type| and |key_name|.  If |key_type| is KEY_USER, the user's
+  // canonical email address must be provided in |user_email|.  Otherwise
+  // |user_email| is ignored.
   virtual void TpmAttestationRegisterKey(
       chromeos::attestation::AttestationKeyType key_type,
+      const std::string& user_email,
       const std::string& key_name,
       const Callback& callback) = 0;
 
   // Asks cryptohomed to asynchronously sign an enterprise challenge with the
   // key specified by |key_type| and |key_name|.  The |domain| and |device_id|
   // parameters will be included in the challenge response.  |challenge| must be
   // a valid enterprise challenge.  On success, the data sent to |callback| is
-  // the challenge response.
+  // the challenge response.  If |key_type| is KEY_USER, the user's canonical
+  // email address must be provided in |user_email|.  Otherwise |user_email| is
+  // ignored.
   virtual void TpmAttestationSignEnterpriseChallenge(
       chromeos::attestation::AttestationKeyType key_type,
+      const std::string& user_email,
       const std::string& key_name,
       const std::string& domain,
       const std::string& device_id,
       chromeos::attestation::AttestationChallengeOptions options,
       const std::string& challenge,
       const DataCallback& callback) = 0;
 
   // Asks cryptohomed to asynchronously sign a simple challenge with the key
   // specified by |key_type| and |key_name|.  |challenge| can be any arbitrary
   // set of bytes.  On success, the data sent to |callback| is the challenge
-  // response.
+  // response.  If |key_type| is KEY_USER, the user's canonical email address
+  // must be provided in |user_email|.  Otherwise |user_email| is ignored.
   virtual void TpmAttestationSignSimpleChallenge(
       chromeos::attestation::AttestationKeyType key_type,
+      const std::string& user_email,
       const std::string& key_name,
       const std::string& challenge,
       const DataCallback& callback) = 0;
 
   // Asks cryptohome to asynchronously retrieve a string associated with given
   // |user| that would be used in mount path instead of |user|.
   // On success the data is sent to |callback|.
   virtual void AsyncGetSanitizedUsername(
       const std::string& user,
       const DataCallback& callback) = 0;
@@ skipping 11 matching lines @@
   static void Shutdown();
 
   // Returns a pointer to the global AsyncMethodCaller instance.
   // Initialize() should already have been called.
   static AsyncMethodCaller* GetInstance();
 };
 
 }  // namespace cryptohome
 
 #endif  // CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_