summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 16:44:23 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 16:44:23 +0000
commitb9a3dc3b7b9c1cb60a7aa05f38a568612e5224cb (patch)
tree9c870a48488a6c043fd3bd0afbc7234295651d7a /net
parent173ac43c225635ee3596ae2f8a7e9dc0ce330f6f (diff)
downloadchromium_src-b9a3dc3b7b9c1cb60a7aa05f38a568612e5224cb.zip
chromium_src-b9a3dc3b7b9c1cb60a7aa05f38a568612e5224cb.tar.gz
chromium_src-b9a3dc3b7b9c1cb60a7aa05f38a568612e5224cb.tar.bz2
Rename ERR_SSL_WEAK_SERVER_KEY to ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY
so that it's clear what kind of key it is referring to. R=agl BUG=51694 TEST=none Review URL: http://codereview.chromium.org/3279004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57868 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/net_error_list.h4
-rw-r--r--net/socket/ssl_client_socket_nss.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h
index d136a7f..014829d 100644
--- a/net/base/net_error_list.h
+++ b/net/base/net_error_list.h
@@ -168,8 +168,8 @@ NET_ERROR(PROXY_AUTH_REQUESTED, -127)
// A known TLS strict server didn't offer the renegotiation extension.
NET_ERROR(SSL_UNSAFE_NEGOTIATION, -128)
-// The SSL server is using a weak cryptographic key.
-NET_ERROR(SSL_WEAK_SERVER_KEY, -129)
+// The SSL server attempted to use a weak ephemeral Diffie-Hellman key.
+NET_ERROR(SSL_WEAK_SERVER_EPHEMERAL_DH_KEY, -129)
// Certificate error codes
//
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 8419928..d69d202 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -210,7 +210,7 @@ int MapNSPRError(PRErrorCode err) {
case SSL_ERROR_UNSAFE_NEGOTIATION:
return ERR_SSL_UNSAFE_NEGOTIATION;
case SSL_ERROR_WEAK_SERVER_KEY:
- return ERR_SSL_WEAK_SERVER_KEY;
+ return ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY;
default: {
if (IS_SSL_ERROR(err)) {