Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 587234: SSL_ERROR_WEAK_SERVER_KEY is renamed

Browse Source 
SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY to be specific about key type.
TBR=kaie.
Modified Files:
	cmd/lib/SSLerrs.h lib/ssl/ssl3con.c lib/ssl/sslerr.h


git-svn-id: svn://10.0.0.236/trunk@261157 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com 2010-09-01 19:43:48 +00:00
parent 83ce5788fc
commit e1d2b6d850
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/security/nss/cmd/lib/SSLerrs.h
View File

@ -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.")

4
mozilla/security/nss/lib/ssl/ssl3con.c
View File

@ -39,7 +39,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* $Id: ssl3con.c,v 1.147 2010-08-28 18:22:07 nelson%bolyard.com Exp $ */
/* $Id: ssl3con.c,v 1.148 2010-09-01 19:43:48 wtc%google.com Exp $ */
#include "cert.h"
#include "ssl.h"
@ -5309,7 +5309,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);

4
mozilla/security/nss/lib/ssl/sslerr.h
View File

@ -36,7 +36,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* $Id: sslerr.h,v 1.12 2010-08-16 18:19:02 wtc%google.com Exp $ */
/* $Id: sslerr.h,v 1.13 2010-09-01 19:43:48 wtc%google.com Exp $ */
#ifndef __SSL_ERR_H_
#define __SSL_ERR_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;