Correctly handle SSL Client Authentication requests when connecting...

net/socket/ssl_client_socket_mac.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_MAC_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_
 #pragma once
 
 #include <Security/Security.h>
 
 #include <string>
 #include <vector>
 
 #include "base/scoped_ptr.h"
 #include "net/base/cert_verify_result.h"
 #include "net/base/completion_callback.h"
+#include "net/base/host_and_port.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_config_service.h"
 #include "net/socket/ssl_client_socket.h"
 
 namespace net {
 
 class CertVerifier;
 class ClientSocketHandle;
 
 // An SSL client socket implemented with Secure Transport.
 class SSLClientSocketMac : 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

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

nit: should this comment be adjusted to mention port?

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

Done, for all 3 SSLClientSocket subclasses.

   // certificate during the SSL handshake. ssl_config specifies the SSL
   // settings.
   SSLClientSocketMac(ClientSocketHandle* transport_socket,
-                     const std::string& hostname,
+                     const HostPortPair& host_and_port,
                      const SSLConfig& ssl_config);
   ~SSLClientSocketMac();
 
   // 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 46 matching lines @@
                                   size_t* data_length);
   static OSStatus SSLWriteCallback(SSLConnectionRef connection,
                                    const void* data,
                                    size_t* data_length);
 
   CompletionCallbackImpl<SSLClientSocketMac> handshake_io_callback_;
   CompletionCallbackImpl<SSLClientSocketMac> transport_read_callback_;
   CompletionCallbackImpl<SSLClientSocketMac> transport_write_callback_;
 
   scoped_ptr<ClientSocketHandle> transport_;
-  std::string hostname_;
+  HostPortPair host_and_port_;
   SSLConfig ssl_config_;
 
   CompletionCallback* user_connect_callback_;
   CompletionCallback* user_read_callback_;
   CompletionCallback* user_write_callback_;
 
   // Used by Read function.
   scoped_refptr<IOBuffer> user_read_buf_;
   int user_read_buf_len_;
 
@@ skipping 40 matching lines @@
   // These are the IOBuffers used for operations on the underlying transport.
   scoped_refptr<IOBuffer> read_io_buf_;
   scoped_refptr<IOBuffer> write_io_buf_;
 
   BoundNetLog net_log_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_