Updating D2D protocol to v1 to support separate sequence numbers.

components/cryptauth/device_to_device_authenticator_unittest.cc

 // 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.
 
 #include "components/cryptauth/device_to_device_authenticator.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/base64url.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/rand_util.h"
 #include "base/timer/mock_timer.h"
 #include "components/cryptauth/authenticator.h"
 #include "components/cryptauth/connection.h"
 #include "components/cryptauth/cryptauth_test_util.h"
 #include "components/cryptauth/device_to_device_responder_operations.h"
 #include "components/cryptauth/fake_secure_message_delegate.h"
 #include "components/cryptauth/secure_context.h"
+#include "components/cryptauth/session_keys.h"
 #include "components/cryptauth/wire_message.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cryptauth {
 
 namespace {
 
 // The account id of the user.
 const char kAccountId[] = "example@gmail.com";
@@ skipping 230 matching lines @@
               OnAuthenticationResultProxy(Authenticator::Result::SUCCESS));
   std::string responder_auth_message = SimulateResponderAuth(hello_message);
   EXPECT_TRUE(secure_context_);
 
   // Validate the local device sends a valid [Initiator Auth] message.
   ASSERT_EQ(1u, connection_.message_buffer().size());
   std::string initiator_auth = connection_.message_buffer()[0]->payload();
 
   bool initiator_auth_validated = false;
   DeviceToDeviceResponderOperations::ValidateInitiatorAuthMessage(
-      initiator_auth, session_symmetric_key_,
+      initiator_auth, SessionKeys(session_symmetric_key_),
       remote_device_.persistent_symmetric_key, responder_auth_message,
       secure_message_delegate_,
       base::Bind(&SaveBooleanResult, &initiator_auth_validated));
   ASSERT_TRUE(initiator_auth_validated);
 }
 
 TEST_F(ProximityAuthDeviceToDeviceAuthenticatorTest, ResponderRejectsHello) {
   std::string hello_message = BeginAuthentication();
 
   // If the responder could not validate the [Hello message], it essentially
@@ skipping 68 matching lines @@
                            Authenticator::kAuthenticationFeature);
   connection_.SendMessage(base::MakeUnique<WireMessage>(
       base::RandBytesAsString(300u), Authenticator::kAuthenticationFeature));
   connection_.OnBytesReceived(wire_message.Serialize());
   connection_.SendMessage(base::MakeUnique<WireMessage>(
       base::RandBytesAsString(300u), Authenticator::kAuthenticationFeature));
   connection_.OnBytesReceived(wire_message.Serialize());
 }
 
 }  // namespace cryptauth