diff options
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/notifier/base/chrome_async_socket.cc | 3 | ||||
| -rw-r--r-- | jingle/notifier/base/xmpp_client_socket_factory.cc | 3 | ||||
| -rw-r--r-- | jingle/notifier/base/xmpp_client_socket_factory.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/jingle/notifier/base/chrome_async_socket.cc b/jingle/notifier/base/chrome_async_socket.cc index 2e2b002..67c1f31 100644 --- a/jingle/notifier/base/chrome_async_socket.cc +++ b/jingle/notifier/base/chrome_async_socket.cc @@ -437,7 +437,8 @@ bool ChromeAsyncSocket::StartTls(const std::string& domain_name) { transport_socket_.reset( client_socket_factory_->CreateSSLClientSocket( transport_socket_.release(), net::HostPortPair(domain_name, 443), - ssl_config_, NULL /* ssl_host_info */)); + ssl_config_, NULL /* ssl_host_info */, + NULL /* TODO(wtc): cert_verifier */)); int status = transport_socket_->Connect(&ssl_connect_callback_); if (status != net::ERR_IO_PENDING) { MessageLoop* message_loop = MessageLoop::current(); diff --git a/jingle/notifier/base/xmpp_client_socket_factory.cc b/jingle/notifier/base/xmpp_client_socket_factory.cc index 0de822a..5b390c2f 100644 --- a/jingle/notifier/base/xmpp_client_socket_factory.cc +++ b/jingle/notifier/base/xmpp_client_socket_factory.cc @@ -35,10 +35,11 @@ net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket( const net::HostPortPair& host_and_port, const net::SSLConfig& ssl_config, net::SSLHostInfo* ssl_host_info, + net::CertVerifier* cert_verifier, net::DnsCertProvenanceChecker* dns_cert_checker) { return client_socket_factory_->CreateSSLClientSocket( transport_socket, host_and_port, ssl_config, ssl_host_info, - dns_cert_checker); + cert_verifier, dns_cert_checker); } } // namespace diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/notifier/base/xmpp_client_socket_factory.h index fef3bfa..db11b90 100644 --- a/jingle/notifier/base/xmpp_client_socket_factory.h +++ b/jingle/notifier/base/xmpp_client_socket_factory.h @@ -33,7 +33,7 @@ class XmppClientSocketFactory : public net::ClientSocketFactory { virtual net::SSLClientSocket* CreateSSLClientSocket( net::ClientSocketHandle* transport_socket, const net::HostPortPair& host_and_port, const net::SSLConfig& ssl_config, - net::SSLHostInfo* ssl_host_info, + net::SSLHostInfo* ssl_host_info, net::CertVerifier* cert_verifier, net::DnsCertProvenanceChecker* dns_cert_checker); private: |