Added an options parameter to TpmAttestationSignEnterpriseChallenge.

chromeos/dbus/cryptohome_client.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_DBUS_CRYPTOHOME_CLIENT_H_
 #define CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 42 matching lines @@
     INCLUDE_STABLE_ID = 1,
     INCLUDE_DEVICE_STATE = 1 << 1
   };
 
   // Key types supported by the Chrome OS attestation subsystem.
   enum AttestationKeyType {
     DEVICE_KEY,
     USER_KEY
   };
 
+  // Options available for customizing an attestation challenge response.
+  enum AttestationChallengeOptions {
+    CHALLENGE_RESPONSE_OPTION_NONE = 0,
+    INCLUDE_SIGNED_PUBLIC_KEY = 1
+  };
+
   virtual ~CryptohomeClient();
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via DBusThreadManager::Get().
   static CryptohomeClient* Create(DBusClientImplementationType type,
                                   dbus::Bus* bus);
 
   // Sets AsyncCallStatus signal handlers.
   // |handler| is called when results for AsyncXXX methods are returned.
   // Cryptohome service will process the calls in a first-in-first-out manner
@@ skipping 212 matching lines @@
   // PKCS #11 token.  The |callback| will be called when the dbus call
   // completes.  When the operation completes, the AsyncCallStatusHandler signal
   // handler is called.  |key_type| and |key_name| specify the key to register.
   virtual void TpmAttestationRegisterKey(
       AttestationKeyType key_type,
       const std::string& key_name,
       const AsyncMethodCallback& callback) = 0;
 
   // Asynchronously signs an enterprise challenge with the key specified by
   // |key_type| and |key_name|.  |domain| and |device_id| will be included in
-  // the challenge response.  |challenge| must be a valid enterprise attestation
-  // challenge.  The |callback| will be called when the dbus call completes.
-  // When the operation completes, the AsyncCallStatusWithDataHandler signal
-  // handler is called.
+  // the challenge response.  |options| control how the challenge response is
+  // generated.  |challenge| must be a valid enterprise attestation challenge.
+  // The |callback| will be called when the dbus call completes.  When the
+  // operation completes, the AsyncCallStatusWithDataHandler signal handler is
+  // called.
   virtual void TpmAttestationSignEnterpriseChallenge(
       AttestationKeyType key_type,
       const std::string& key_name,
       const std::string& domain,
       const std::string& device_id,
+      AttestationChallengeOptions options,
       const std::string& challenge,
       const AsyncMethodCallback& callback) = 0;
 
   // Asynchronously signs a simple challenge with the key specified by
   // |key_type| and |key_name|.  |challenge| can be any set of arbitrary bytes.
   // A nonce will be appended to the challenge before signing; this method
   // cannot be used to sign arbitrary data.  The |callback| will be called when
   // the dbus call completes.  When the operation completes, the
   // AsyncCallStatusWithDataHandler signal handler is called.
   virtual void TpmAttestationSignSimpleChallenge(
       AttestationKeyType key_type,
       const std::string& key_name,
       const std::string& challenge,
       const AsyncMethodCallback& callback) = 0;
 
  protected:
   // Create() should be used instead.
   CryptohomeClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CryptohomeClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_