diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 17:21:16 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 17:21:16 +0000 |
| commit | 58f433385af79e560ab61fa19dd19f5725f17f84 (patch) | |
| tree | 603dbf9ec86c00ce396c1ebc53cd555f94d527ab /net | |
| parent | 13d49eaf47a59c68f952b5470d11afdd7bdce396 (diff) | |
| download | chromium_src-58f433385af79e560ab61fa19dd19f5725f17f84.zip chromium_src-58f433385af79e560ab61fa19dd19f5725f17f84.tar.gz chromium_src-58f433385af79e560ab61fa19dd19f5725f17f84.tar.bz2 | |
Update to NSS 3.12.7 and NSPR 4.8.6 (original review URL
http://codereview.chromium.org/3135002/show).
Map PR_INVALID_ARGUMENT_ERROR and SEC_ERROR_INVALID_ARGS
to net::ERR_INVALID_ARGUMENT. This allows us to fail the
SSL handshake with net::ERR_INVALID_ARGUMENT instead of
the default net::ERR_FAILED when we connect to broken
servers that use tiny keys for DHE cipher suites.
R=agl
BUG=51694
TEST=No build errors or test failures
Review URL: http://codereview.chromium.org/3132005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index e935f80..8331e18 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -182,6 +182,11 @@ int MapNSPRError(PRErrorCode err) { return ERR_ADDRESS_UNREACHABLE; case PR_ADDRESS_NOT_AVAILABLE_ERROR: return ERR_ADDRESS_INVALID; + case PR_INVALID_ARGUMENT_ERROR: + return ERR_INVALID_ARGUMENT; + + case SEC_ERROR_INVALID_ARGS: + return ERR_INVALID_ARGUMENT; case SSL_ERROR_SSL_DISABLED: return ERR_NO_SSL_VERSIONS_ENABLED; |