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

Backout the previous patch. Restore state of the trunk before tagging the tree.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@259856 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alexei.volkov.bugs%sun.com 2010-03-01 20:03:45 +00:00
parent d2224befe7
commit 1121fde6c4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
/* TLS extension code moved here from ssl3ecc.c */ /* TLS extension code moved here from ssl3ecc.c */
/* $Id: ssl3ext.c,v 1.12 2010-02-26 19:25:44 alexei.volkov.bugs%sun.com Exp $ */ /* $Id: ssl3ext.c,v 1.13 2010-03-01 20:03:45 alexei.volkov.bugs%sun.com Exp $ */
#include "nssrenam.h" #include "nssrenam.h"
#include "nss.h" #include "nss.h"
@ -1501,6 +1501,8 @@ ssl3_HandleRenegotiationInfoXtn(sslSocket *ss, PRUint16 ex_type, SECItem *data)
data->data[0] != len || (len && data->data[0] != len || (len &&
NSS_SecureMemcmp(ss->ssl3.hs.finishedMsgs.data, NSS_SecureMemcmp(ss->ssl3.hs.finishedMsgs.data,
data->data + 1, len))) { data->data + 1, len))) {
/* Can we do this here? Or, must we arrange for the caller to do it? */
(void)SSL3_SendAlert(ss, alert_fatal, handshake_failure);
PORT_SetError(SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE); PORT_SetError(SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE);
return SECFailure; return SECFailure;
} }