summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 18:05:00 +0000
committersnej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 18:05:00 +0000
commit63aa23ac6d73c8754879caa717f7ad9b2073a90f (patch)
tree5cf65c2677a085691ae5b2018bf4c6de9e694321
parent44bcf3a3922cc26fb86789c1a22d62c27c1f8e12 (diff)
downloadchromium_src-63aa23ac6d73c8754879caa717f7ad9b2073a90f.zip
chromium_src-63aa23ac6d73c8754879caa717f7ad9b2073a90f.tar.gz
chromium_src-63aa23ac6d73c8754879caa717f7ad9b2073a90f.tar.bz2
Better error messages for SSL client-cert errors.
BUG=36480 TEST=none Review URL: http://codereview.chromium.org/1026007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41968 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd23
-rw-r--r--chrome/renderer/localized_error.cc14
2 files changed, 37 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 95b1600..def2446 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4692,6 +4692,29 @@ Keep your key file in a safe place. You will need it to create new versions of y
Unknown error.
</message>
+ <message name="IDS_ERRORPAGES_HEADING_SSL_PROTOCOL_ERROR" desc="Heading in the error page for SSL protocol errors.">
+ SSL connection error.
+ </message>
+ <message name="IDS_ERRORPAGES_SUMMARY_SSL_PROTOCOL_ERROR" desc="Summary in the error page for SSL protocol errors.">
+ Unable to make a secure connection to the server. This may be a problem with the server, or it may be requiring a client authentication certificate that you don't have.
+ </message>
+ <message name="IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR" desc="The error message displayed for SSL protocol errors.">
+ SSL protocol error.
+ </message>
+
+ <message name="IDS_ERRORPAGES_HEADING_BAD_SSL_CLIENT_AUTH_CERT" desc="Heading in the error page for SSL client certificate authentication failure.">
+ Certificate-based authentication failed.
+ </message>
+ <message name="IDS_ERRORPAGES_SUMMARY_BAD_SSL_CLIENT_AUTH_CERT" desc="Summary in the error page for SSL client certificate authentication failure.">
+ This server requires a certificate for authentication, and didn't accept the one sent by the
+ browser. Your certificate may have expired, or the server may not trust its issuer.
+ You can try again with a different certificate, if you have one, or you may have to
+ obtain a valid certificate from elsewhere.
+ </message>
+ <message name="IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT" desc="The error message for SSL client certificate authentication failure.">
+ Bad SSL client authentication certificate.
+ </message>
+
<message name="IDS_ERRORPAGES_HTTP_POST_WARNING" desc="The error message displayed when the user navigates back or forward to a page which would resubmit post data. They can hit reload to send POST data again and load the page.">
This web page requires data that you entered earlier in order to be properly displayed. You can send this data again, but by doing so you will repeat any action this page previously performed. Press Reload to resend that data and display this page.
</message>
diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc
index 37dea28..71624cd 100644
--- a/chrome/renderer/localized_error.cc
+++ b/chrome/renderer/localized_error.cc
@@ -88,6 +88,20 @@ WebErrorNetErrorMap net_error_options[] = {
IDS_ERRORPAGES_DETAILS_TOO_MANY_REDIRECTS,
SUGGEST_RELOAD | SUGGEST_LEARNMORE,
},
+ {net::ERR_SSL_PROTOCOL_ERROR,
+ IDS_ERRORPAGES_TITLE_LOAD_FAILED,
+ IDS_ERRORPAGES_HEADING_SSL_PROTOCOL_ERROR,
+ IDS_ERRORPAGES_SUMMARY_SSL_PROTOCOL_ERROR,
+ IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
+ SUGGEST_NONE,
+ },
+ {net::ERR_BAD_SSL_CLIENT_AUTH_CERT,
+ IDS_ERRORPAGES_TITLE_LOAD_FAILED,
+ IDS_ERRORPAGES_HEADING_BAD_SSL_CLIENT_AUTH_CERT,
+ IDS_ERRORPAGES_SUMMARY_BAD_SSL_CLIENT_AUTH_CERT,
+ IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT,
+ SUGGEST_NONE,
+ },
};
bool LocaleIsRTL() {