diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 19:43:53 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 19:43:53 +0000 |
commit | e5624f0b84c761a2a88fc30dd6d95b71a5b44ad6 (patch) | |
tree | 0b8c7ef9296786dcd233c9640a1a69a4fa008235 /net/url_request/url_request_job.h | |
parent | faf6cc757fa0e8f0baf343c589a3d35bb7019e23 (diff) | |
download | chromium_src-e5624f0b84c761a2a88fc30dd6d95b71a5b44ad6.zip chromium_src-e5624f0b84c761a2a88fc30dd6d95b71a5b44ad6.tar.gz chromium_src-e5624f0b84c761a2a88fc30dd6d95b71a5b44ad6.tar.bz2 |
net: make HSTS hosts use the normal SSL interstitials
(Reland of r102947, which was reverted in r102950.)
SSL interstitials have better translations for the error messages and this
returns us to the point where we have only a single UI for SSL errors, which
will make some future changes easier.
First, this change changes the SSL error callbacks to take an SSLInfo& rather
than a X509Certificate* (which was already a TODO(wtc) in the code). Most of
this change is the resulting plumbing.
It also adds a |is_hsts_host| flag to the callbacks to denote an HSTS host.
Finally, in ssl_policy.cc the |is_hsts_host| flag causes any error to be
fatal.
BUG=93527
http://codereview.chromium.org/7976036/
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_job.h')
-rw-r--r-- | net/url_request/url_request_job.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h index 01547cc..4231ddd 100644 --- a/net/url_request/url_request_job.h +++ b/net/url_request/url_request_job.h @@ -30,6 +30,7 @@ class HttpRequestHeaders; class HttpResponseInfo; class IOBuffer; class SSLCertRequestInfo; +class SSLInfo; class URLRequest; class UploadData; class URLRequestStatus; @@ -197,7 +198,8 @@ class NET_EXPORT URLRequestJob : public base::RefCounted<URLRequestJob>, void NotifyCertificateRequested(SSLCertRequestInfo* cert_request_info); // Notifies the job about an SSL certificate error. - void NotifySSLCertificateError(int cert_error, X509Certificate* cert); + void NotifySSLCertificateError(const SSLInfo& ssl_info, + bool is_hsts_host); // Delegates to URLRequest::Delegate. bool CanGetCookies(const CookieList& cookie_list) const; |