Added an options parameter to TpmAttestationSignEnterpriseChallenge.

Cryptohome now supports including a SignedPublicKeyAndChallenge embedded
in a challenge response.  The new options parameter allows a caller to
request that this be included.

BUG=chromium:219965
TEST=chromeos_unittests


Review URL: https://chromiumcodereview.appspot.com/13638022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192976 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 7 deletions

diff --git a/chromeos/cryptohome/async_method_caller.cc b/chromeos/cryptohome/async_method_caller.cc
index 6506067..2478182 100644
--- a/chromeos/cryptohome/async_method_caller.cc
+++ b/chromeos/cryptohome/async_method_caller.cc
@@ -158,6 +158,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
       const std::string& key_name,
       const std::string& domain,
       const std::string& device_id,
+      chromeos::CryptohomeClient::AttestationChallengeOptions options,
       const std::string& challenge,
       const DataCallback& callback) OVERRIDE {
     DBusThreadManager::Get()->GetCryptohomeClient()->
@@ -166,6 +167,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
             key_name,
             domain,
             device_id,
+            options,
             challenge,
             base::Bind(
                 &AsyncMethodCallerImpl::RegisterAsyncDataCallback,
diff --git a/chromeos/cryptohome/async_method_caller.h b/chromeos/cryptohome/async_method_caller.h
index ff62748..0957397 100644
--- a/chromeos/cryptohome/async_method_caller.h
+++ b/chromeos/cryptohome/async_method_caller.h
@@ -133,6 +133,7 @@ class CHROMEOS_EXPORT AsyncMethodCaller {
       const std::string& key_name,
       const std::string& domain,
       const std::string& device_id,
+      chromeos::CryptohomeClient::AttestationChallengeOptions options,
       const std::string& challenge,
       const DataCallback& callback) = 0;
 
diff --git a/chromeos/cryptohome/mock_async_method_caller.h b/chromeos/cryptohome/mock_async_method_caller.h
index c4e2ec1..8fc2b8b 100644
--- a/chromeos/cryptohome/mock_async_method_caller.h
+++ b/chromeos/cryptohome/mock_async_method_caller.h
@@ -56,13 +56,15 @@ class MockAsyncMethodCaller : public AsyncMethodCaller {
                void(chromeos::CryptohomeClient::AttestationKeyType key_type,
                     const std::string& key_name,
                     const Callback& callback));
-  MOCK_METHOD6(TpmAttestationSignEnterpriseChallenge,
-               void(chromeos::CryptohomeClient::AttestationKeyType key_type,
-                    const std::string& key_name,
-                    const std::string& domain,
-                    const std::string& device_id,
-                    const std::string& challenge,
-                    const DataCallback& callback));
+  MOCK_METHOD7(
+      TpmAttestationSignEnterpriseChallenge,
+      void(chromeos::CryptohomeClient::AttestationKeyType key_type,
+           const std::string& key_name,
+           const std::string& domain,
+           const std::string& device_id,
+           chromeos::CryptohomeClient::AttestationChallengeOptions options,
+           const std::string& challenge,
+           const DataCallback& callback));
   MOCK_METHOD4(TpmAttestationSignSimpleChallenge,
                void(chromeos::CryptohomeClient::AttestationKeyType key_type,
                     const std::string& key_name,