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

Bug 681065: Replace hardcoded ssl_variant_stream with ss->protocolVariant.

Browse Source 
r=ekr.
Modified Files:
	ssl3con.c sslsock.c


git-svn-id: svn://10.0.0.236/trunk@264231 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com 2012-09-21 00:24:53 +00:00
parent 3f21f40150
commit e34d846f91
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* $Id: ssl3con.c,v 1.187 2012-08-25 00:13:27 wtc%google.com Exp $ */ /* $Id: ssl3con.c,v 1.188 2012-09-21 00:24:53 wtc%google.com Exp $ */
/* TODO(ekr): Implement HelloVerifyRequest on server side. OK for now. */ /* TODO(ekr): Implement HelloVerifyRequest on server side. OK for now. */
@ -775,7 +775,7 @@ ssl3_NegotiateVersion(sslSocket *ss, SSL3ProtocolVersion peerVersion,
} }
ss->version = PR_MIN(peerVersion, ss->vrange.max); ss->version = PR_MIN(peerVersion, ss->vrange.max);
PORT_Assert(ssl3_VersionIsSupported(ssl_variant_stream, ss->version)); PORT_Assert(ssl3_VersionIsSupported(ss->protocolVariant, ss->version));
return SECSuccess; return SECSuccess;
} }

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

@ -6,7 +6,7 @@
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* $Id: sslsock.c,v 1.93 2012-06-14 19:03:29 wtc%google.com Exp $ */ /* $Id: sslsock.c,v 1.94 2012-09-21 00:24:53 wtc%google.com Exp $ */
#include "seccomon.h" #include "seccomon.h"
#include "cert.h" #include "cert.h"
#include "keyhi.h" #include "keyhi.h"
@ -1848,7 +1848,7 @@ SSL_VersionRangeSet(PRFileDesc *fd, const SSLVersionRange *vrange)
return SECFailure; return SECFailure;
} }
if (!ssl3_VersionRangeIsValid(ssl_variant_stream, vrange)) { if (!ssl3_VersionRangeIsValid(ss->protocolVariant, vrange)) {
PORT_SetError(SSL_ERROR_INVALID_VERSION_RANGE); PORT_SetError(SSL_ERROR_INVALID_VERSION_RANGE);
return SECFailure; return SECFailure;
} }