Simplify SPAKE2 implementation.

crypto/p224_spake_unittest.cc

 // Copyright (c) 2011 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 <crypto/p224_spake.h>
 
 #include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace crypto;
@@ skipping 25 matching lines @@
         server_result == P224EncryptedKeyExchange::kResultSuccess) {
       return true;
     }
 
     CHECK_EQ(P224EncryptedKeyExchange::kResultPending, client_result);
     CHECK_EQ(P224EncryptedKeyExchange::kResultPending, server_result);
   }
 }
 
 static const char kPassword[] = "foo";
-static const char kSession[] = "bar";
 
 TEST(MutualAuth, CorrectAuth) {
   P224EncryptedKeyExchange client(
-      P224EncryptedKeyExchange::kPeerTypeClient,
-      kPassword, kSession);
+      P224EncryptedKeyExchange::kPeerTypeClient, kPassword);
   P224EncryptedKeyExchange server(
-      P224EncryptedKeyExchange::kPeerTypeServer,
-      kPassword, kSession);
+      P224EncryptedKeyExchange::kPeerTypeServer, kPassword);
 
   EXPECT_TRUE(RunExchange(&client, &server));
+  EXPECT_EQ(client.GetKey(), server.GetKey());
 }
 
 TEST(MutualAuth, IncorrectPassword) {
   P224EncryptedKeyExchange client(
       P224EncryptedKeyExchange::kPeerTypeClient,
-      kPassword, kSession);
+      kPassword);
   P224EncryptedKeyExchange server(
       P224EncryptedKeyExchange::kPeerTypeServer,
-      "wrongpassword", kSession);
+      "wrongpassword");
 
   EXPECT_FALSE(RunExchange(&client, &server));
 }
-
-TEST(MutualAuth, IncorrectSession) {
-  P224EncryptedKeyExchange client(
-      P224EncryptedKeyExchange::kPeerTypeClient,
-      kPassword, kSession);
-  P224EncryptedKeyExchange server(
-      P224EncryptedKeyExchange::kPeerTypeServer,
-      kPassword, "wrongsession");
-
-  EXPECT_FALSE(RunExchange(&client, &server));
-}
 
 TEST(MutualAuth, Fuzz) {
   static const unsigned kIterations = 40;
 
   for (unsigned i = 0; i < kIterations; i++) {
     P224EncryptedKeyExchange client(
-        P224EncryptedKeyExchange::kPeerTypeClient,
-        kPassword, kSession);
+        P224EncryptedKeyExchange::kPeerTypeClient, kPassword);
     P224EncryptedKeyExchange server(
-        P224EncryptedKeyExchange::kPeerTypeServer,
-        kPassword, kSession);
+        P224EncryptedKeyExchange::kPeerTypeServer, kPassword);
 
     // We'll only be testing small values of i, but we don't want that to bias
     // the test coverage. So we disperse the value of i by multiplying by the
     // FNV, 32-bit prime, producing a poor-man's PRNG.
     const uint32 rand = i * 16777619;
 
     for (unsigned round = 0;; round++) {
       std::string client_message, server_message;
       client_message = client.GetMessage();
       server_message = server.GetMessage();
@@ skipping 29 matching lines @@
         break;
       }
 
       ASSERT_EQ(P224EncryptedKeyExchange::kResultPending,
                 client_result);
       ASSERT_EQ(P224EncryptedKeyExchange::kResultPending,
                 server_result);
     }
   }
 }