Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(972)

Unified Diff: chrome/browser/ssl/ssl_error_info.cc

Issue 23908005: Handle all non-overridable SSL errors in the same place (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Accidentally removed whitespace, added back in Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ssl/ssl_error_info.cc
diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc
index d11beb80f34efef283a82b3535d1332171e7b9e3..f8d3e8cf61dc770600ab61409d6ee68ae6ad709d 100644
--- a/chrome/browser/ssl/ssl_error_info.cc
+++ b/chrome/browser/ssl/ssl_error_info.cc
@@ -198,6 +198,10 @@ SSLErrorInfo SSLErrorInfo::CreateError(ErrorType error_type,
l10n_util::GetStringUTF16(
IDS_CERT_ERROR_WEAK_KEY_EXTRA_INFO_2));
break;
+ case CERT_WEAK_KEY_DH:
+ case CERT_PINNED_KEY_MISSING:
+ // CERT_PINNED_KEY_MISSING and CERT_WEAK_KEY_DH never go through the
+ // overridable interstitial, which is what uses these strings.
case UNKNOWN:
title = l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_TITLE);
details = l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DETAILS);
@@ -236,6 +240,10 @@ SSLErrorInfo::ErrorType SSLErrorInfo::NetErrorToErrorType(int net_error) {
return CERT_WEAK_SIGNATURE_ALGORITHM;
case net::ERR_CERT_WEAK_KEY:
return CERT_WEAK_KEY;
+ case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY:
+ return CERT_WEAK_KEY_DH;
+ case net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN:
+ return CERT_PINNED_KEY_MISSING;
default:
NOTREACHED();
return UNKNOWN;

Powered by Google App Engine
This is Rietveld 408576698