diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 21:40:03 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 21:40:03 +0000 |
| commit | 7b8b0c08fd7539cc63ff1a3127fbc3ba4dd206c9 (patch) | |
| tree | 837b02cf4b2da548514eebfa3fe9cb92220b3df8 /net | |
| parent | 9d382623f22ba8348e657a8321276e542904596a (diff) | |
| download | chromium_src-7b8b0c08fd7539cc63ff1a3127fbc3ba4dd206c9.zip chromium_src-7b8b0c08fd7539cc63ff1a3127fbc3ba4dd206c9.tar.gz chromium_src-7b8b0c08fd7539cc63ff1a3127fbc3ba4dd206c9.tar.bz2 | |
Add ERR_SSL_UNRECOGNIZED_NAME_ALERT for the TLS unrecognized_name alert.
The unrecognized_name alert is specified in
http://tools.ietf.org/html/rfc6066#section-3.
R=davidben@chromium.org,rsleevi@chromium.org
BUG=none
TEST=Visit https://atakemlak.sahibinden.com/. Should get the
ERR_SSL_UNRECOGNIZED_NAME_ALERT error. For more info, see NSS bug
https://bugzilla.mozilla.org/show_bug.cgi?id=960844.
Review URL: https://codereview.chromium.org/146113002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/net_error_list.h | 3 | ||||
| -rw-r--r-- | net/socket/nss_ssl_util.cc | 2 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h index f07877e..5ceaf44 100644 --- a/net/base/net_error_list.h +++ b/net/base/net_error_list.h @@ -310,6 +310,9 @@ NET_ERROR(SSL_INAPPROPRIATE_FALLBACK, -157) // Certificate Transparency: All Signed Certificate Timestamps failed to verify. NET_ERROR(CT_NO_SCTS_VERIFIED_OK, -158) +// The SSL server sent us a fatal unrecognized_name alert. +NET_ERROR(SSL_UNRECOGNIZED_NAME_ALERT, -159) + // Certificate error codes // // The values of certificate error codes must be consecutive. diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc index b5d946d..20911d5 100644 --- a/net/socket/nss_ssl_util.cc +++ b/net/socket/nss_ssl_util.cc @@ -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: diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 3925ca1..f95fd17 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -132,6 +132,8 @@ int MapOpenSSLErrorSSL() { return ERR_SSL_BAD_RECORD_MAC_ALERT; case SSL_R_TLSV1_ALERT_DECRYPT_ERROR: return ERR_SSL_DECRYPT_ERROR_ALERT; + case SSL_R_TLSV1_UNRECOGNIZED_NAME: + return ERR_SSL_UNRECOGNIZED_NAME_ALERT; case SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED: return ERR_SSL_UNSAFE_NEGOTIATION; case SSL_R_WRONG_NUMBER_OF_KEY_BITS: |