Correctly handle SSL Client Authentication requests when connecting...

remoting/jingle_glue/ssl_socket_adapter.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 "remoting/jingle_glue/ssl_socket_adapter.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "net/base/address_list.h"
+#include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/sys_addrinfo.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/url_request/url_request_context.h"
 #include "remoting/jingle_glue/utils.h"
 
 namespace remoting {
 
 SSLSocketAdapter* SSLSocketAdapter::Create(AsyncSocket* socket) {
@@ skipping 40 matching lines @@
     return net::ERR_UNEXPECTED;
   }
 
   // SSLConfigService is not thread-safe, and the default values for SSLConfig
   // are correct for us, so we don't use the config service to initialize this
   // object.
   net::SSLConfig ssl_config;
   transport_socket_->set_addr(talk_base::SocketAddress(hostname_, 0));
   ssl_socket_.reset(
       net::ClientSocketFactory::GetDefaultFactory()->CreateSSLClientSocket(
-          transport_socket_, hostname_.c_str(), ssl_config,
+          transport_socket_, net::HostPortPair(hostname_, 443), ssl_config,
           NULL /* ssl_host_info */));
 
   int result = ssl_socket_->Connect(&connected_callback_);
 
   if (result == net::ERR_IO_PENDING || result == net::OK) {
     return 0;
   } else {
     LOG(ERROR) << "Could not start SSL: " << net::ErrorToString(result);
     return result;
   }
@@ skipping 264 matching lines @@
         write_buffer_len_ = buffer_len;
         return;
       }
     }
     was_used_to_convey_data_ = true;
     callback->RunWithParams(Tuple1<int>(result));
   }
 }
 
 }  // namespace remoting