Implement Token Binding negotiation TLS extension

net/socket/ssl_client_socket_unittest.cc

 // Copyright (c) 2012 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 "net/socket/ssl_client_socket.h"
 
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
@@ skipping 3113 matching lines @@
 
   scoped_ptr<SSLClientSocket> sock(CreateSSLClientSocket(
       transport.Pass(), test_server.host_port_pair(), config));
 
   rv = sock->Connect(callback.callback());
   rv = callback.GetResult(rv);
 
   EXPECT_EQ(ERR_SSL_VERSION_OR_CIPHER_MISMATCH, rv);
 }
 
+TEST_F(SSLClientSocketChannelIDTest, TokenBindingEnabled) {

[davidben, 2015/10/15 21:52:09]

You're not using any of the Channel ID test harness, so I would just make this
an SSLClientSocketTest.

[nharper, 2015/10/20 22:52:19]

I'm using EnableChannelID from SSLClientSocketChannelIDTest.

+  SpawnedTestServer::SSLOptions ssl_options;
+  ssl_options.supported_token_binding_params.push_back(
+      TB_PARAM_ECDSAP256_SHA256);
+  ssl_options.disable_channel_id = true;
+  ASSERT_TRUE(ConnectToTestServer(ssl_options));
+
+  EnableChannelID();
+  SSLConfig ssl_config;
+  ssl_config.token_binding_params.push_back(TB_PARAM_ECDSAP256_SHA256);
+  ssl_config.channel_id_enabled = true;
+
+  int rv;
+  ASSERT_TRUE(CreateAndConnectSSLClientSocket(ssl_config, &rv));
+  EXPECT_EQ(OK, rv);
+  SSLInfo info;
+  EXPECT_TRUE(sock_->GetSSLInfo(&info));
+  EXPECT_TRUE(info.token_binding_negotiated);
+  EXPECT_EQ(TB_PARAM_ECDSAP256_SHA256, info.token_binding_key_param);
+}
+
+TEST_F(SSLClientSocketChannelIDTest, TokenBindingFailsWithEmsDisabled) {

[davidben, 2015/10/15 21:52:09]

Ditto.

[nharper, 2015/10/20 22:52:19]

Ditto.

+  SpawnedTestServer::SSLOptions ssl_options;
+  ssl_options.supported_token_binding_params.push_back(
+      TB_PARAM_ECDSAP256_SHA256);
+  ssl_options.disable_extended_master_secret = true;
+  ssl_options.disable_channel_id = true;
+  ASSERT_TRUE(ConnectToTestServer(ssl_options));
+
+  EnableChannelID();
+  SSLConfig ssl_config;
+  ssl_config.token_binding_params.push_back(TB_PARAM_ECDSAP256_SHA256);
+  ssl_config.channel_id_enabled = true;
+
+  int rv;
+  ASSERT_TRUE(CreateAndConnectSSLClientSocket(ssl_config, &rv));
+  EXPECT_EQ(ERR_SSL_PROTOCOL_ERROR, rv);
+}
+

[davidben, 2015/10/15 21:52:09]

Think it's worth having a test with where TB just isn't negotiated? Would have
caught some of the uninitialized value stuff when it floated into ASan I think.

[nharper, 2015/10/20 22:52:19]

I don't see any harm in adding that test. ASan didn't catch any use of
uninitialized values when running that test. I haven't checked msan.

 TEST_F(SSLClientSocketFalseStartTest, FalseStartEnabled) {
   // False Start requires NPN/ALPN, ECDHE, and an AEAD.
   SpawnedTestServer::SSLOptions server_options;
   server_options.key_exchanges =
       SpawnedTestServer::SSLOptions::KEY_EXCHANGE_ECDHE_RSA;
   server_options.bulk_ciphers =
       SpawnedTestServer::SSLOptions::BULK_CIPHER_AES128GCM;
   server_options.enable_npn = true;
   SSLConfig client_config;
   client_config.next_protos.push_back(kProtoHTTP11);
@@ skipping 268 matching lines @@
   ssl_config.channel_id_enabled = true;
 
   int rv;
   ASSERT_TRUE(CreateAndConnectSSLClientSocket(ssl_config, &rv));
 
   EXPECT_EQ(ERR_UNEXPECTED, rv);
   EXPECT_FALSE(sock_->IsConnected());
 }
 
 }  // namespace net