Do a better job at faking simple challenge signatures.

chromeos/dbus/fake_cryptohome_client.h

 // Copyright 2013 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_FAKE_CRYPTOHOME_CLIENT_H_
 #define CHROMEOS_DBUS_FAKE_CRYPTOHOME_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 196 matching lines @@
   // default, GetSystemSalt() returns the value generated by
   // GetStubSystemSalt().
   void set_system_salt(const std::vector<uint8_t>& system_salt) {
     system_salt_ = system_salt;
   }
 
   // Returns the stub system salt as raw bytes. (not as a string encoded in the
   // format used by SystemSaltGetter::ConvertRawSaltToHexString()).
   static std::vector<uint8_t> GetStubSystemSalt();
 
+  // Signature nonces are twenty bytes. This matches the attestation code.
+  static const std::string kTwentyBytesNonce;
+  // Something symbolic as a signature.
+  static const std::string kSignature;

[Darren Krahn, 2016/09/02 17:32:12]

These constants can go in the cc file in an anonymous namespace (and then drop
the 'static'). Also, make these POD type.

https://engdoc.corp.google.com/eng/doc/devguide/cpp/styleguide.shtml?cl=head#...

[The one and only Dr. Crash, 2016/09/03 01:17:37]

Thanks for the pointer. And to think these were POD until Patchset 3 where I
thought I should promote them to std::string. I will also move them back to the
.cc file and have the unit tests only check for what matters, e.g. that the
original data is before the nonce and that the nonce is 20 bytes long (just to
avoid hard to debug issues later for those who hardcode 20 byes like our DM
server).

+
  private:
   void ReturnProtobufMethodCallback(
       const cryptohome::BaseReply& reply,
       const ProtobufMethodCallback& callback);
 
   // Posts tasks which return fake results to the UI thread.
-  void ReturnAsyncMethodResult(const AsyncMethodCallback& callback,
-                               bool returns_data);
+  void ReturnAsyncMethodResult(const AsyncMethodCallback& callback);
 
-  // This method is used to implement ReturnAsyncMethodResult.
-  void ReturnAsyncMethodResultInternal(const AsyncMethodCallback& callback,
-                                       bool returns_data);
+  // Posts tasks which return fake data to the UI thread.
+  void ReturnAsyncMethodData(const AsyncMethodCallback& callback,
+                             const std::string& data);
+
+  // This method is used to implement ReturnAsyncMethodResult without data.
+  void ReturnAsyncMethodResultInternal(const AsyncMethodCallback& callback);
+
+  // This method is used to implement ReturnAsyncMethodResult with data.
+  void ReturnAsyncMethodDataInternal(const AsyncMethodCallback& callback,
+                                     const std::string& data);
 
   bool service_is_available_;
   int async_call_id_;
   AsyncCallStatusHandler async_call_status_handler_;
   AsyncCallStatusWithDataHandler async_call_status_data_handler_;
   bool unmount_result_;
   std::vector<uint8_t> system_salt_;
 
   std::vector<WaitForServiceToBeAvailableCallback>
       pending_wait_for_service_to_be_available_callbacks_;
 
   // A stub store for InstallAttributes, mapping an attribute name to the
   // associated data blob. Used to implement InstallAttributesSet and -Get.
   std::map<std::string, std::vector<uint8_t>> install_attrs_;
   bool locked_;
   base::WeakPtrFactory<FakeCryptohomeClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeCryptohomeClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_FAKE_CRYPTOHOME_CLIENT_H_