diff options
Diffstat (limited to 'chromium/net/socket/nss_ssl_util.cc')
| -rw-r--r-- | chromium/net/socket/nss_ssl_util.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/chromium/net/socket/nss_ssl_util.cc b/chromium/net/socket/nss_ssl_util.cc index 33e7e6b89ac..7b068545a55 100644 --- a/chromium/net/socket/nss_ssl_util.cc +++ b/chromium/net/socket/nss_ssl_util.cc @@ -201,7 +201,7 @@ class NSSSSLInitSingleton { PRFileDesc* model_fd_; }; -static base::LazyInstance<NSSSSLInitSingleton> g_nss_ssl_init_singleton = +static base::LazyInstance<NSSSSLInitSingleton>::Leaky g_nss_ssl_init_singleton = LAZY_INSTANCE_INITIALIZER; // Initialize the NSS SSL library if it isn't already initialized. This must @@ -330,6 +330,8 @@ int MapNSSError(PRErrorCode err) { return ERR_SSL_BAD_RECORD_MAC_ALERT; case SSL_ERROR_DECRYPT_ERROR_ALERT: return ERR_SSL_DECRYPT_ERROR_ALERT; + case SSL_ERROR_UNRECOGNIZED_NAME_ALERT: + return ERR_SSL_UNRECOGNIZED_NAME_ALERT; case SSL_ERROR_UNSAFE_NEGOTIATION: return ERR_SSL_UNSAFE_NEGOTIATION; case SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY: @@ -355,12 +357,16 @@ int MapNSSError(PRErrorCode err) { return ERR_SSL_INAPPROPRIATE_FALLBACK; default: { + const char* err_name = PR_ErrorToName(err); + if (err_name == NULL) + err_name = ""; if (IS_SSL_ERROR(err)) { - LOG(WARNING) << "Unknown SSL error " << err + LOG(WARNING) << "Unknown SSL error " << err << " (" << err_name << ")" << " mapped to net::ERR_SSL_PROTOCOL_ERROR"; return ERR_SSL_PROTOCOL_ERROR; } - LOG(WARNING) << "Unknown error " << err << " mapped to net::ERR_FAILED"; + LOG(WARNING) << "Unknown error " << err << " (" << err_name << ")" + << " mapped to net::ERR_FAILED"; return ERR_FAILED; } } |