summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 21:51:12 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 21:51:12 +0000
commitd8fbf589947080e223c40c3dad7b2f3f7a54c66d (patch)
tree197f56d4838ae199613e1d60e0a869f6f7c478cb /jingle
parenta74507d345c15f077dcd72b810185ade89fedce5 (diff)
downloadchromium_src-d8fbf589947080e223c40c3dad7b2f3f7a54c66d.zip
chromium_src-d8fbf589947080e223c40c3dad7b2f3f7a54c66d.tar.gz
chromium_src-d8fbf589947080e223c40c3dad7b2f3f7a54c66d.tar.bz2
net: add certificate provenance checking.
BUG=none TEST=none http://codereview.chromium.org/4448001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/notifier/base/xmpp_client_socket_factory.cc5
-rw-r--r--jingle/notifier/base/xmpp_client_socket_factory.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.cc b/jingle/notifier/base/xmpp_client_socket_factory.cc
index 78cb1bc..810a8b5 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.cc
+++ b/jingle/notifier/base/xmpp_client_socket_factory.cc
@@ -34,9 +34,10 @@ net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket(
net::ClientSocketHandle* transport_socket,
const std::string& hostname,
const net::SSLConfig& ssl_config,
- net::SSLHostInfo* ssl_host_info) {
+ net::SSLHostInfo* ssl_host_info,
+ net::DnsRRResolver* dnsrr_resolver) {
return client_socket_factory_->CreateSSLClientSocket(
- transport_socket, hostname, ssl_config, ssl_host_info);
+ transport_socket, hostname, ssl_config, ssl_host_info, dnsrr_resolver);
}
} // namespace
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/notifier/base/xmpp_client_socket_factory.h
index eb94555..718bcda 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.h
+++ b/jingle/notifier/base/xmpp_client_socket_factory.h
@@ -10,6 +10,7 @@
#include "net/socket/client_socket_factory.h"
namespace net {
+class DnsRRResolver;
class SSLHostInfo;
}
@@ -30,7 +31,8 @@ class XmppClientSocketFactory : public net::ClientSocketFactory {
const net::NetLog::Source& source);
virtual net::SSLClientSocket* CreateSSLClientSocket(
net::ClientSocketHandle* transport_socket, const std::string& hostname,
- const net::SSLConfig& ssl_config, net::SSLHostInfo* ssl_host_info);
+ const net::SSLConfig& ssl_config, net::SSLHostInfo* ssl_host_info,
+ net::DnsRRResolver* dnsrr_resolver);
private:
net::ClientSocketFactory* const client_socket_factory_;