diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-21 02:02:29 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-21 02:02:29 +0000 |
| commit | 2d0dbbaa2379e0b5d11909f25584c4da0c0610d2 (patch) | |
| tree | ce9459be2d31a36fa9d0fbe539a3c0cd2820c351 /net | |
| parent | 9293f24476481c51ea0d4804a8c8db7888f02d93 (diff) | |
| download | chromium_src-2d0dbbaa2379e0b5d11909f25584c4da0c0610d2.zip chromium_src-2d0dbbaa2379e0b5d11909f25584c4da0c0610d2.tar.gz chromium_src-2d0dbbaa2379e0b5d11909f25584c4da0c0610d2.tar.bz2 | |
Map the NSS error code SEC_ERROR_CA_CERT_INVALID (-8156)
to ERR_CERT_AUTHORITY_INVALID.
R=ukai
BUG=12359
TEST=Visit https://www.grounation.org/. The SSL error page
should say "The site's security certificate is not trusted!"
rather than "Invalid Server Certificate".
Review URL: http://codereview.chromium.org/115597
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/ssl_client_socket_nss.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/base/ssl_client_socket_nss.cc b/net/base/ssl_client_socket_nss.cc index 7318b25..a8993a932 100644 --- a/net/base/ssl_client_socket_nss.cc +++ b/net/base/ssl_client_socket_nss.cc @@ -64,6 +64,7 @@ int NetErrorFromNSPRError(PRErrorCode err) { case SEC_ERROR_REVOKED_CERTIFICATE: case SEC_ERROR_REVOKED_KEY: return ERR_CERT_REVOKED; + case SEC_ERROR_CA_CERT_INVALID: case SEC_ERROR_UNKNOWN_ISSUER: case SEC_ERROR_UNTRUSTED_CERT: case SEC_ERROR_UNTRUSTED_ISSUER: @@ -141,7 +142,7 @@ int SSLClientSocketNSS::Init() { class ConnectCallbackWrapper : public CompletionCallbackImpl<ConnectCallbackWrapper> { public: - ConnectCallbackWrapper(CompletionCallback* user_callback) + explicit ConnectCallbackWrapper(CompletionCallback* user_callback) : ALLOW_THIS_IN_INITIALIZER_LIST( CompletionCallbackImpl<ConnectCallbackWrapper>(this, &ConnectCallbackWrapper::ReturnValueWrapper)), |