diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 20:17:24 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 20:17:24 +0000 |
| commit | c292ea748c83c95f8ed50ad30cc94a6c0aedd68d (patch) | |
| tree | c88d6507000c0254ba191ecf53d083323e6067ad | |
| parent | fd596127c051e635bafbd3d10cc36348765b25da (diff) | |
| download | chromium_src-c292ea748c83c95f8ed50ad30cc94a6c0aedd68d.zip chromium_src-c292ea748c83c95f8ed50ad30cc94a6c0aedd68d.tar.gz chromium_src-c292ea748c83c95f8ed50ad30cc94a6c0aedd68d.tar.bz2 | |
Merge 122166 - Display an interstitial for weak key errors.
Without this, the request is canceled, but no interstitial is shown.
I have checked that all other ERR_CERT_ errors are handled and only
ERR_CERT_NON_UNIQUE_NAME is missing. However, I don't see that
ERR_CERT_NON_UNIQUE_NAME can actually be returned, so that's probably
fine.
(There is also ERR_CERT_NOT_IN_DNS, but that should be removed.)
BUG=113645
TEST=Import a 512-bit CA (see bug) and try to navigate to a site which uses it. Verify that an interstitial is shown.
https://chromiumcodereview.appspot.com/9358060/
TBR=agl@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9432007
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@122861 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/security_filter_peer.cc | 1 | ||||
| -rw-r--r-- | content/browser/ssl/ssl_policy.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/chrome/renderer/security_filter_peer.cc b/chrome/renderer/security_filter_peer.cc index 994543c..df770a4 100644 --- a/chrome/renderer/security_filter_peer.cc +++ b/chrome/renderer/security_filter_peer.cc @@ -38,6 +38,7 @@ SecurityFilterPeer* case net::ERR_CERT_REVOKED: case net::ERR_CERT_INVALID: case net::ERR_CERT_WEAK_SIGNATURE_ALGORITHM: + case net::ERR_CERT_WEAK_KEY: case net::ERR_INSECURE_RESPONSE: case net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN: if (ResourceType::IsFrame(resource_type)) diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc index 8bdcb10..d2941cd 100644 --- a/content/browser/ssl/ssl_policy.cc +++ b/content/browser/ssl/ssl_policy.cc @@ -64,6 +64,7 @@ void SSLPolicy::OnCertError(SSLCertErrorHandler* handler) { case net::ERR_CERT_DATE_INVALID: case net::ERR_CERT_AUTHORITY_INVALID: case net::ERR_CERT_WEAK_SIGNATURE_ALGORITHM: + case net::ERR_CERT_WEAK_KEY: OnCertErrorInternal(handler, !handler->fatal()); break; case net::ERR_CERT_NO_REVOCATION_MECHANISM: |