OLD | NEW |
(Empty) | |
| 1 Index: mozilla/security/nss/lib/ssl/ssl3con.c |
| 2 =================================================================== |
| 3 RCS file: /cvsroot/mozilla/security/nss/lib/ssl/ssl3con.c,v |
| 4 retrieving revision 1.186 |
| 5 diff -u -p -8 -r1.186 ssl3con.c |
| 6 --- mozilla/security/nss/lib/ssl/ssl3con.c 30 Jul 2012 00:47:36 -0000
1.186 |
| 7 +++ mozilla/security/nss/lib/ssl/ssl3con.c 15 Aug 2012 00:29:49 -0000 |
| 8 @@ -770,17 +770,17 @@ ssl3_NegotiateVersion(sslSocket *ss, SSL |
| 9 |
| 10 if (peerVersion < ss->vrange.min || |
| 11 (peerVersion > ss->vrange.max && !allowLargerPeerVersion)) { |
| 12 PORT_SetError(SSL_ERROR_NO_CYPHER_OVERLAP); |
| 13 return SECFailure; |
| 14 } |
| 15 |
| 16 ss->version = PR_MIN(peerVersion, ss->vrange.max); |
| 17 - PORT_Assert(ssl3_VersionIsSupported(ssl_variant_stream, ss->version)); |
| 18 + PORT_Assert(ssl3_VersionIsSupported(ss->protocolVariant, ss->version)); |
| 19 |
| 20 return SECSuccess; |
| 21 } |
| 22 |
| 23 static SECStatus |
| 24 ssl3_GetNewRandom(SSL3Random *random) |
| 25 { |
| 26 PRUint32 gmt = ssl_Time(); |
| 27 Index: mozilla/security/nss/lib/ssl/sslsock.c |
| 28 =================================================================== |
| 29 RCS file: /cvsroot/mozilla/security/nss/lib/ssl/sslsock.c,v |
| 30 retrieving revision 1.93 |
| 31 diff -u -p -8 -r1.93 sslsock.c |
| 32 --- mozilla/security/nss/lib/ssl/sslsock.c 14 Jun 2012 19:03:29 -0000
1.93 |
| 33 +++ mozilla/security/nss/lib/ssl/sslsock.c 15 Aug 2012 00:29:49 -0000 |
| 34 @@ -1843,17 +1843,17 @@ SSL_VersionRangeSet(PRFileDesc *fd, cons |
| 35 sslSocket *ss = ssl_FindSocket(fd); |
| 36 |
| 37 if (!ss) { |
| 38 SSL_DBG(("%d: SSL[%d]: bad socket in SSL3_VersionRangeSet", |
| 39 SSL_GETPID(), fd)); |
| 40 return SECFailure; |
| 41 } |
| 42 |
| 43 - if (!ssl3_VersionRangeIsValid(ssl_variant_stream, vrange)) { |
| 44 + if (!ssl3_VersionRangeIsValid(ss->protocolVariant, vrange)) { |
| 45 PORT_SetError(SSL_ERROR_INVALID_VERSION_RANGE); |
| 46 return SECFailure; |
| 47 } |
| 48 |
| 49 ssl_Get1stHandshakeLock(ss); |
| 50 ssl_GetSSL3HandshakeLock(ss); |
| 51 |
| 52 ss->vrange = *vrange; |
OLD | NEW |