diff options
author | davidben <davidben@chromium.org> | 2015-05-30 11:34:28 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-30 18:35:01 +0000 |
commit | 9a38456c11f5f6031e6710e958f7838e978ee05d (patch) | |
tree | 494108aea0f810167419b89b4d9936047165940f /net/socket | |
parent | 1b262ee0753de9d7830fee5502ae49817546105c (diff) | |
download | chromium_src-9a38456c11f5f6031e6710e958f7838e978ee05d.zip chromium_src-9a38456c11f5f6031e6710e958f7838e978ee05d.tar.gz chromium_src-9a38456c11f5f6031e6710e958f7838e978ee05d.tar.bz2 |
Remove ERR_SSL_UNSAFE_NEGOTIATION error code.
Let them map to the default ERR_SSL_PROTOCOL_ERROR. It was added, along with a
custom error message, in https://crrev.com/51258. The
enforcement was then removed in https://codereview.chromium.org/6792032, but
the error code and custom message remained. Prune them; the error is now
unreachable but for some codepaths in NSS (server originally supported RI and
renego without it) and the custom error message is now innaccurate.
BUG=none
Review URL: https://codereview.chromium.org/1151833004
Cr-Commit-Position: refs/heads/master@{#332125}
Diffstat (limited to 'net/socket')
-rw-r--r-- | net/socket/nss_ssl_util.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc index c7bb324..554bd27 100644 --- a/net/socket/nss_ssl_util.cc +++ b/net/socket/nss_ssl_util.cc @@ -339,8 +339,6 @@ int MapNSSError(PRErrorCode err) { 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: return ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY; case SSL_ERROR_HANDSHAKE_NOT_COMPLETED: |