summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 16:39:00 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 16:39:00 +0000
commit41a8669d04f762fe62a68b74425133b3c91f9ff6 (patch)
tree7289381e127c4e9ede8e2550da91a1325516b60f /webkit/tools
parent46bcd237ebf1d597de0f0f974c7adb3ede6ba621 (diff)
downloadchromium_src-41a8669d04f762fe62a68b74425133b3c91f9ff6.zip
chromium_src-41a8669d04f762fe62a68b74425133b3c91f9ff6.tar.gz
chromium_src-41a8669d04f762fe62a68b74425133b3c91f9ff6.tar.bz2
net: make HSTS hosts use the normal SSL interstitials
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@102947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/simple_resource_loader_bridge.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 6498e75..73fd0cb 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -458,8 +458,8 @@ class RequestProxy : public net::URLRequest::Delegate,
}
virtual void OnSSLCertificateError(net::URLRequest* request,
- int cert_error,
- net::X509Certificate* cert) OVERRIDE {
+ const net::SSLInfo& ssl_info,
+ bool is_hsts_host) OVERRIDE {
// Allow all certificate errors.
request->ContinueDespiteLastError();
}