summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_client_socket.h
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 16:18:43 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 16:18:43 +0000
commit93fa0379d245a901428bbd7f0424831a1df091e4 (patch)
tree1079a9c031f5b77831f1f14bdf299c0fe0aea9cd /net/socket/ssl_client_socket.h
parent7c6c62215562506e63c70eab0484fbc04fa691bb (diff)
downloadchromium_src-93fa0379d245a901428bbd7f0424831a1df091e4.zip
chromium_src-93fa0379d245a901428bbd7f0424831a1df091e4.tar.gz
chromium_src-93fa0379d245a901428bbd7f0424831a1df091e4.tar.bz2
Revert "net: remove DNS certificate checking code."
This reverts commit r114642 - it broke ChromeOS. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket.h')
-rw-r--r--net/socket/ssl_client_socket.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
index e040e38..64ccd78 100644
--- a/net/socket/ssl_client_socket.h
+++ b/net/socket/ssl_client_socket.h
@@ -17,6 +17,7 @@
namespace net {
class CertVerifier;
+class DnsCertProvenanceChecker;
class OriginBoundCertService;
class SSLCertRequestInfo;
class SSLHostInfo;
@@ -31,22 +32,26 @@ struct SSLClientSocketContext {
: cert_verifier(NULL),
origin_bound_cert_service(NULL),
transport_security_state(NULL),
+ dns_cert_checker(NULL),
ssl_host_info_factory(NULL) {}
SSLClientSocketContext(CertVerifier* cert_verifier_arg,
OriginBoundCertService* origin_bound_cert_service_arg,
TransportSecurityState* transport_security_state_arg,
+ DnsCertProvenanceChecker* dns_cert_checker_arg,
SSLHostInfoFactory* ssl_host_info_factory_arg,
const std::string& ssl_session_cache_shard_arg)
: cert_verifier(cert_verifier_arg),
origin_bound_cert_service(origin_bound_cert_service_arg),
transport_security_state(transport_security_state_arg),
+ dns_cert_checker(dns_cert_checker_arg),
ssl_host_info_factory(ssl_host_info_factory_arg),
ssl_session_cache_shard(ssl_session_cache_shard_arg) {}
CertVerifier* cert_verifier;
OriginBoundCertService* origin_bound_cert_service;
TransportSecurityState* transport_security_state;
+ DnsCertProvenanceChecker* dns_cert_checker;
SSLHostInfoFactory* ssl_host_info_factory;
// ssl_session_cache_shard is an opaque string that identifies a shard of the
// SSL session cache. SSL sockets with the same ssl_session_cache_shard may