Updating D2D protocol to v1 to support separate sequence numbers.

components/cryptauth/device_to_device_initiator_operations.h

 // Copyright 2015 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 COMPONENTS_CRYPTAUTH_DEVICE_TO_DEVICE_INITIATOR_OPERATIONS_H_
 #define COMPONENTS_CRYPTAUTH_DEVICE_TO_DEVICE_INITIATOR_OPERATIONS_H_
 
+#include <memory>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
+#include "components/cryptauth/session_keys.h"
 
 namespace cryptauth {
 
 class SecureMessageDelegate;
 
 // Utility class containing operations in the DeviceToDevice protocol that the
 // initiator needs to perform. For Smart Lock, in which a phone unlocks a
 // laptop, the initiator is laptop.
 //
 // All operations are asynchronous because we use the SecureMessageDelegate for
@@ skipping 14 matching lines @@
 class DeviceToDeviceInitiatorOperations {
  public:
   // Callback for operations that create a message. Invoked with the serialized
   // SecureMessage upon success or the empty string upon failure.
   typedef base::Callback<void(const std::string&)> MessageCallback;
 
   // Callback for ValidateResponderAuthMessage. The first argument will be
   // called with the validation outcome. If validation succeeded, then the
   // second argument will contain the session symmetric key derived from the
   // [Responder Auth] message.
-  typedef base::Callback<void(bool, const std::string&)>
+  typedef base::Callback<void(bool, const SessionKeys&)>
       ValidateResponderAuthCallback;
 
   // Creates the [Hello] message, which is the first message that is sent:
   // |session_public_key|: This session public key will be stored in plaintext
   //     (but signed) so the responder can parse it.
   // |persistent_symmetric_key|: The long-term symmetric key that is shared by
   //     the initiator and responder.
   // |secure_message_delegate|: Delegate for SecureMessage operations. This
   //     instance is not owned, and must live until after |callback| is invoked.
   // |callback|: Invoked upon operation completion with the serialized message
@@ skipping 25 matching lines @@
       const std::string& responder_auth_message,
       const std::string& persistent_responder_public_key,
       const std::string& persistent_symmetric_key,
       const std::string& session_private_key,
       const std::string& hello_message,
       SecureMessageDelegate* secure_message_delegate,
       const ValidateResponderAuthCallback& callback);
 
   // Creates the [Initiator Auth] message, which allows the responder to
   // authenticate the initiator:
+  // |session_keys|: The session symmetric keys.
   // |persistent_symmetric_key|: The long-term symmetric key that is shared by
   //     the initiator and responder.
   // |responder_auth_message|: The [Responder Auth] message sent previously to
   // the responder. These bytes are used in the signature calculation.
   // |secure_message_delegate|: Delegate for SecureMessage operations. This
   //     instance is not owned, and must live until after |callback| is invoked.
   // |callback|: Invoked upon operation completion with the serialized message
   //     or an empty string.
   static void CreateInitiatorAuthMessage(
-      const std::string& session_symmetric_key,
+      const SessionKeys& session_keys,
       const std::string& persistent_symmetric_key,
       const std::string& responder_auth_message,
       SecureMessageDelegate* secure_message_delegate,
       const MessageCallback& callback);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(DeviceToDeviceInitiatorOperations);
 };
 
 }  // cryptauth
 
 #endif  // COMPONENTS_CRYPTAUTH_DEVICE_TO_DEVICE_INITIATOR_OPERATIONS_H_