diff options
author | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 17:50:33 +0000 |
---|---|---|
committer | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 17:50:33 +0000 |
commit | bacff6543fbb0df029aae780589c4a7274b5ce34 (patch) | |
tree | fdac545e371a322f17503571d4cbf470aac94627 /net/base/ssl_config_service.h | |
parent | 78b8fcc96715381894a5171645c54444c868e3b0 (diff) | |
download | chromium_src-bacff6543fbb0df029aae780589c4a7274b5ce34.zip chromium_src-bacff6543fbb0df029aae780589c4a7274b5ce34.tar.gz chromium_src-bacff6543fbb0df029aae780589c4a7274b5ce34.tar.bz2 |
Resubmitted code from revision 12809. The bug in the Windows SSL stack that
this code originally uncovered has been fixed in a separate changelist.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/ssl_config_service.h')
-rw-r--r-- | net/base/ssl_config_service.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/base/ssl_config_service.h b/net/base/ssl_config_service.h index 96d42a2..dec6fdb 100644 --- a/net/base/ssl_config_service.h +++ b/net/base/ssl_config_service.h @@ -5,7 +5,10 @@ #ifndef NET_BASE_SSL_CONFIG_SERVICE_H__ #define NET_BASE_SSL_CONFIG_SERVICE_H__ +#include <set> + #include "base/time.h" +#include "net/base/x509_certificate.h" namespace net { @@ -23,6 +26,12 @@ struct SSLConfig { bool ssl2_enabled; // True if SSL 2.0 is enabled. bool ssl3_enabled; // True if SSL 3.0 is enabled. bool tls1_enabled; // True if TLS 1.0 is enabled. + + // Add any known-bad SSL certificates to allowed_bad_certs_ that should not + // trigger an ERR_CERT_*_INVALID error when calling SSLClientSocket::Connect. + // This would normally be done in response to the user explicitly accepting + // the bad certificate. + std::set<scoped_refptr<X509Certificate> > allowed_bad_certs_; }; // This class is responsible for getting and setting the SSL configuration. |