Correctly handle SSL Client Authentication requests when connecting...

net/socket/client_socket_factory.cc

 // Copyright (c) 2010 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/client_socket_factory.h"
 
 #include "base/singleton.h"
 #include "build/build_config.h"
 #include "net/socket/client_socket_handle.h"
 #if defined(OS_WIN)
 #include "net/socket/ssl_client_socket_win.h"
 #elif defined(USE_OPENSSL)
 #include "net/socket/ssl_client_socket_openssl.h"
 #elif defined(USE_NSS)
 #include "net/socket/ssl_client_socket_nss.h"
 #elif defined(OS_MACOSX)
 #include "net/socket/ssl_client_socket_nss.h"
 #endif
 #include "net/socket/ssl_host_info.h"
 #include "net/socket/tcp_client_socket.h"
 
 namespace net {
 
 class DnsRRResolver;
 
 namespace {
 
 SSLClientSocket* DefaultSSLClientSocketFactory(
     ClientSocketHandle* transport_socket,
-    const std::string& hostname,
+    const HostPortPair& host_and_port,
     const SSLConfig& ssl_config,
     SSLHostInfo* ssl_host_info,
     DnsRRResolver* dnsrr_resolver) {
   scoped_ptr<SSLHostInfo> shi(ssl_host_info);
 #if defined(OS_WIN)
-  return new SSLClientSocketWin(transport_socket, hostname, ssl_config);
+  return new SSLClientSocketWin(transport_socket, host_and_port, ssl_config);
 #elif defined(USE_OPENSSL)
-  return new SSLClientSocketOpenSSL(transport_socket, hostname, ssl_config);
+  return new SSLClientSocketOpenSSL(transport_socket, host_and_port,
+                                    ssl_config);
 #elif defined(USE_NSS)
-  return new SSLClientSocketNSS(transport_socket, hostname, ssl_config,
+  return new SSLClientSocketNSS(transport_socket, host_and_port, ssl_config,
                                 shi.release(), dnsrr_resolver);
 #elif defined(OS_MACOSX)
-  return new SSLClientSocketNSS(transport_socket, hostname, ssl_config,
+  return new SSLClientSocketNSS(transport_socket, host_and_port, ssl_config,
                                 shi.release(), dnsrr_resolver);
 #else
   NOTIMPLEMENTED();
   return NULL;
 #endif
 }
 
 SSLClientSocketFactory g_ssl_factory = DefaultSSLClientSocketFactory;
 
 class DefaultClientSocketFactory : public ClientSocketFactory {
  public:
   virtual ClientSocket* CreateTCPClientSocket(
       const AddressList& addresses,
       NetLog* net_log,
       const NetLog::Source& source) {
     return new TCPClientSocket(addresses, net_log, source);
   }
 
   virtual SSLClientSocket* CreateSSLClientSocket(
       ClientSocketHandle* transport_socket,
-      const std::string& hostname,
+      const HostPortPair& host_and_port,
       const SSLConfig& ssl_config,
       SSLHostInfo* ssl_host_info,
       DnsRRResolver* dnsrr_resolver) {
-    return g_ssl_factory(transport_socket, hostname, ssl_config, ssl_host_info,
-                         dnsrr_resolver);
+    return g_ssl_factory(transport_socket, host_and_port, ssl_config,
+                         ssl_host_info, dnsrr_resolver);
   }
 };
 
 }  // namespace
 
 // static
 ClientSocketFactory* ClientSocketFactory::GetDefaultFactory() {
   return Singleton<DefaultClientSocketFactory>::get();
 }
 
 // static
 void ClientSocketFactory::SetSSLClientSocketFactory(
     SSLClientSocketFactory factory) {
   g_ssl_factory = factory;
 }
 
 // Deprecated function (http://crbug.com/37810) that takes a ClientSocket.
 SSLClientSocket* ClientSocketFactory::CreateSSLClientSocket(
     ClientSocket* transport_socket,
-    const std::string& hostname,
+    const HostPortPair& host_and_port,
     const SSLConfig& ssl_config,
     SSLHostInfo* ssl_host_info) {
   ClientSocketHandle* socket_handle = new ClientSocketHandle();
   socket_handle->set_socket(transport_socket);
-  return CreateSSLClientSocket(socket_handle, hostname, ssl_config,
+  return CreateSSLClientSocket(socket_handle, host_and_port, ssl_config,
                                ssl_host_info, NULL /* DnsRRResolver */);
 }
 
 }  // namespace net