diff options
| author | wtc%google.com <devnull@localhost> | 2010-09-01 19:47:11 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2010-09-01 19:47:11 +0000 |
| commit | 4fe63769ca32dbdad710e4038e9a23af8bac8e7e (patch) | |
| tree | a968b5b01f4845660998c854b27a377bdff993a0 | |
| parent | b8e762f1e79aa46c478dcbf086fac4ecac2d9df5 (diff) | |
| download | nss-hg-4fe63769ca32dbdad710e4038e9a23af8bac8e7e.tar.gz | |
Bug 587234: SSL_ERROR_WEAK_SERVER_KEY is renamed
SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY to be specific about key type.
TBR=kaie.
Modified Files:
Tag: NSS_3_12_BRANCH
cmd/lib/SSLerrs.h lib/ssl/ssl3con.c lib/ssl/sslerr.h
| -rw-r--r-- | security/nss/cmd/lib/SSLerrs.h | 4 | ||||
| -rw-r--r-- | security/nss/lib/ssl/ssl3con.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/ssl/sslerr.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/cmd/lib/SSLerrs.h b/security/nss/cmd/lib/SSLerrs.h index 9435e2e93..3b85025e8 100644 --- a/security/nss/cmd/lib/SSLerrs.h +++ b/security/nss/cmd/lib/SSLerrs.h @@ -403,5 +403,5 @@ ER3(SSL_ERROR_UNSAFE_NEGOTIATION, (SSL_ERROR_BASE + 113), ER3(SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD, (SSL_ERROR_BASE + 114), "SSL received an unexpected uncompressed record.") -ER3(SSL_ERROR_WEAK_SERVER_KEY, (SSL_ERROR_BASE + 115), -"SSL received a weak key in Server Key Exchange handshake message.") +ER3(SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY, (SSL_ERROR_BASE + 115), +"SSL received a weak ephemeral Diffie-Hellman key in Server Key Exchange handshake message.") diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c index 97c2d6ee4..fcefccc79 100644 --- a/security/nss/lib/ssl/ssl3con.c +++ b/security/nss/lib/ssl/ssl3con.c @@ -5307,7 +5307,7 @@ ssl3_HandleServerKeyExchange(sslSocket *ss, SSL3Opaque *b, PRUint32 length) goto loser; /* malformed. */ } if (dh_p.len < 512/8) { - errCode = SSL_ERROR_WEAK_SERVER_KEY; + errCode = SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY; goto alert_loser; } rv = ssl3_ConsumeHandshakeVariable(ss, &dh_g, 2, &b, &length); diff --git a/security/nss/lib/ssl/sslerr.h b/security/nss/lib/ssl/sslerr.h index 4edde1fd4..67b1c3c82 100644 --- a/security/nss/lib/ssl/sslerr.h +++ b/security/nss/lib/ssl/sslerr.h @@ -201,7 +201,7 @@ SSL_ERROR_UNSAFE_NEGOTIATION = (SSL_ERROR_BASE + 113), SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD = (SSL_ERROR_BASE + 114), -SSL_ERROR_WEAK_SERVER_KEY = (SSL_ERROR_BASE + 115), +SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY = (SSL_ERROR_BASE + 115), SSL_ERROR_END_OF_LIST /* let the c compiler determine the value of this. */ } SSLErrorCodes; |