Updating D2D protocol to v1 to support separate sequence numbers.

components/cryptauth/device_to_device_authenticator.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_AUTHENTICATOR_H_
 #define COMPONENTS_CRYPTAUTH_DEVICE_TO_DEVICE_AUTHENTICATOR_H_
 
+#include <memory>
+
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/cryptauth/authenticator.h"
 #include "components/cryptauth/connection.h"
 #include "components/cryptauth/connection_observer.h"
 
 namespace base {
 class Timer;
 };
 
 namespace cryptauth {
 class SecureMessageDelegate;
+class SessionKeys;
 }
 
 namespace cryptauth {
 
 // Authenticator implementation using the "device to device" protocol, which is
 // in turn built on top of the SecureMessage library.
 // This protocol contains the following steps (local device is the initiator):
 //   1. Both initiator and responder devices generate a temporary key pair for
 //      the session.
 //   2. Initiator sends [Hello] message to responder device, which contains the
@@ skipping 72 matching lines @@
                           const std::string& private_key);
 
   // Callback when [Hello] is created.
   void OnHelloMessageCreated(const std::string& message);
 
   // Callback when waiting for [Remote Auth] times out.
   void OnResponderAuthTimedOut();
 
   // Callback for validating the received [Remote Auth].
   void OnResponderAuthValidated(bool validated,
-                                const std::string& session_symmetric_key);
+                                std::unique_ptr<SessionKeys> session_keys);
 
   // Callback when [Initiator Auth] is created.
   void OnInitiatorAuthCreated(const std::string& message);
 
   // Callback when the session symmetric key is derived.
   void OnKeyDerived(const std::string& session_symmetric_key);
 
   // Called when the authentication flow fails, and logs |error_message|. The
   // overloaded version specifies the Result to be reported;
   // otherwise, a FAILURE result will be reported.
@@ skipping 37 matching lines @@
 
   // The bytes of the [Hello] message sent to the remote device.
   std::string hello_message_;
 
   // The bytes of the [Responder Auth] message received from the remote device.
   std::string responder_auth_message_;
 
   // The private key generated for the session.
   std::string local_session_private_key_;
 
   // The derived symmetric key for the session.

[Tim Song, 2017/05/22 23:18:24]

nit: s/key/keys

[sacomoto, 2017/05/23 09:50:13]

Done.

-  std::string session_symmetric_key_;
+  std::unique_ptr<SessionKeys> session_keys_;
 
   base::WeakPtrFactory<DeviceToDeviceAuthenticator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceToDeviceAuthenticator);
 };
 
 }  // namespace cryptauth
 
 #endif  // COMPONENTS_CRYPTAUTH_DEVICE_TO_DEVICE_AUTHENTICATOR_H_