Correctly handle SSL Client Authentication requests when connecting...

net/socket/ssl_client_socket_win.h

 // 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.
 
 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_WIN_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_WIN_H_
 #pragma once
 
 #define SECURITY_WIN32  // Needs to be defined before including security.h
 
 #include <windows.h>
 #include <wincrypt.h>
 #include <security.h>
 
 #include <string>
 
 #include "base/scoped_ptr.h"
 #include "net/base/cert_verify_result.h"
 #include "net/base/completion_callback.h"
+#include "net/base/host_port_pair.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_config_service.h"
 #include "net/socket/ssl_client_socket.h"
 
 namespace net {
 
+class BoundNetLog;
 class CertVerifier;
 class ClientSocketHandle;
-class BoundNetLog;
+class HostPortPair;
 
 // An SSL client socket implemented with the Windows Schannel.
 class SSLClientSocketWin : public SSLClientSocket {
  public:
   // Takes ownership of the |transport_socket|, which must already be connected.
-  // The given hostname will be compared with the name(s) in the server's
-  // certificate during the SSL handshake.  ssl_config specifies the SSL
-  // settings.
+  // The hostname specified in |host_and_port| will be compared with the name(s)
+  // in the server's certificate during the SSL handshake.  If SSL client
+  // authentication is requested, the host_and_port field of SSLCertRequestInfo
+  // will be populated with |host_and_port|.  |ssl_config| specifies
+  // the SSL settings.
   SSLClientSocketWin(ClientSocketHandle* transport_socket,
-                     const std::string& hostname,
+                     const HostPortPair& host_and_port,
                      const SSLConfig& ssl_config);
   ~SSLClientSocketWin();
 
   // SSLClientSocket methods:
   virtual void GetSSLInfo(SSLInfo* ssl_info);
   virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
   virtual NextProtoStatus GetNextProto(std::string* proto);
 
   // ClientSocket methods:
   virtual int Connect(CompletionCallback* callback);
@@ skipping 47 matching lines @@
   void DidCompleteRenegotiation();
   void LogConnectionTypeMetrics() const;
   void FreeSendBuffer();
 
   // Internal callbacks as async operations complete.
   CompletionCallbackImpl<SSLClientSocketWin> handshake_io_callback_;
   CompletionCallbackImpl<SSLClientSocketWin> read_callback_;
   CompletionCallbackImpl<SSLClientSocketWin> write_callback_;
 
   scoped_ptr<ClientSocketHandle> transport_;
-  std::string hostname_;
+  HostPortPair hostname_;

[eroman, 2010/11/12 01:12:56]

Please change the name to say host_and_port_, or something as such.

[Ryan Hamilton, 2010/11/12 16:47:26]

Done.

   SSLConfig ssl_config_;
 
   // User function to callback when the Connect() completes.
   CompletionCallback* user_connect_callback_;
 
   // User function to callback when a Read() completes.
   CompletionCallback* user_read_callback_;
   scoped_refptr<IOBuffer> user_read_buf_;
   int user_read_buf_len_;
 
@@ skipping 71 matching lines @@
 
   // True when the decrypter needs more data in order to decrypt.
   bool need_more_data_;
 
   BoundNetLog net_log_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_WIN_H_