Correctly handle SSL Client Authentication requests when connecting...

net/socket/ssl_client_socket_mac.cc

Index: net/socket/ssl_client_socket_mac.cc
===================================================================
--- net/socket/ssl_client_socket_mac.cc	(revision 65205)
+++ net/socket/ssl_client_socket_mac.cc	(working copy)
@@ -14,6 +14,7 @@
 #include "base/string_util.h"
 #include "net/base/address_list.h"
 #include "net/base/cert_verifier.h"
+#include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
@@ -500,6 +501,7 @@
 
 SSLClientSocketMac::SSLClientSocketMac(ClientSocketHandle* transport_socket,
                                        const std::string& hostname,
+                                       uint16 port,
                                        const SSLConfig& ssl_config)
     : handshake_io_callback_(this, &SSLClientSocketMac::OnHandshakeIOComplete),
       transport_read_callback_(this,
@@ -508,6 +510,7 @@
                                 &SSLClientSocketMac::OnTransportWriteComplete),
       transport_(transport_socket),
       hostname_(hostname),
+      port_(port),
       ssl_config_(ssl_config),
       user_connect_callback_(NULL),
       user_read_callback_(NULL),
@@ -720,7 +723,7 @@
   }
 
   // Now get the available client certs whose issuers are allowed by the server.
-  cert_request_info->host_and_port = hostname_;
+  cert_request_info->host_and_port = HostPortPair(hostname_, port_).ToString();
   cert_request_info->client_certs.clear();
   X509Certificate::GetSSLClientCertificates(hostname_,

[wtc, 2010/11/11 01:11:35]

Please add a TODO comment to note that we should consider
passing a host-port pair as the first argument to
X509Certificate::GetSSLClientCertificates.

[Ryan Hamilton, 2010/11/11 18:57:00]

Done.

                                             valid_issuers,