| OLD | NEW |
| 1 From 577e6655d4edc789eb4c572b303daf888676a454 Mon Sep 17 00:00:00 2001 | 1 diff -pu -r a/net/third_party/nss/ssl/sslreveal.c b/net/third_party/nss/ssl/sslr
eveal.c |
| 2 From: Adam Langley <agl@chromium.org> | 2 --- a/net/third_party/nss/ssl/sslreveal.c» 2012-04-25 07:50:12.000000000 -0
700 |
| 3 Date: Mon, 3 Oct 2011 12:27:21 -0400 | 3 +++ b/net/third_party/nss/ssl/sslreveal.c» 2012-11-09 15:45:44.118267683 -0
800 |
| 4 Subject: [PATCH] negotiatedextension.patch | 4 @@ -79,7 +79,6 @@ SSL_HandshakeNegotiatedExtension(PRFileD |
| 5 | |
| 6 --- | |
| 7 mozilla/security/nss/lib/ssl/sslreveal.c | 9 +-------- | |
| 8 1 files changed, 1 insertions(+), 8 deletions(-) | |
| 9 | |
| 10 diff --git a/mozilla/security/nss/lib/ssl/sslreveal.c b/mozilla/security/nss/lib
/ssl/sslreveal.c | |
| 11 index 94b2c2f..0b9bb82 100644 | |
| 12 --- a/mozilla/security/nss/lib/ssl/sslreveal.c | |
| 13 +++ b/mozilla/security/nss/lib/ssl/sslreveal.c | |
| 14 @@ -111,7 +111,6 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, | |
| 15 /* some decisions derived from SSL_GetChannelInfo */ | 5 /* some decisions derived from SSL_GetChannelInfo */ |
| 16 sslSocket * sslsocket = NULL; | 6 sslSocket * sslsocket = NULL; |
| 17 SECStatus rv = SECFailure; | 7 SECStatus rv = SECFailure; |
| 18 - PRBool enoughFirstHsDone = PR_FALSE; | 8 - PRBool enoughFirstHsDone = PR_FALSE; |
| 19 | 9 |
| 20 if (!pYes) | 10 if (!pYes) |
| 21 return rv; | 11 return rv; |
| 22 @@ -123,14 +122,8 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, | 12 @@ -91,14 +90,8 @@ SSL_HandshakeNegotiatedExtension(PRFileD |
| 23 return rv; | 13 return rv; |
| 24 } | 14 } |
| 25 | 15 |
| 26 - if (sslsocket->firstHsDone) { | 16 - if (sslsocket->firstHsDone) { |
| 27 - enoughFirstHsDone = PR_TRUE; | 17 - enoughFirstHsDone = PR_TRUE; |
| 28 - } else if (sslsocket->ssl3.initialized && ssl3_CanFalseStart(sslsocket)) { | 18 - } else if (sslsocket->ssl3.initialized && ssl3_CanFalseStart(sslsocket)) { |
| 29 - enoughFirstHsDone = PR_TRUE; | 19 - enoughFirstHsDone = PR_TRUE; |
| 30 - } | 20 - } |
| 31 - | 21 - |
| 32 /* according to public API SSL_GetChannelInfo, this doesn't need a lock */ | 22 /* according to public API SSL_GetChannelInfo, this doesn't need a lock */ |
| 33 - if (sslsocket->opt.useSecurity && enoughFirstHsDone) { | 23 - if (sslsocket->opt.useSecurity && enoughFirstHsDone) { |
| 34 + if (sslsocket->opt.useSecurity) { | 24 + if (sslsocket->opt.useSecurity) { |
| 35 if (sslsocket->ssl3.initialized) { /* SSL3 and TLS */ | 25 if (sslsocket->ssl3.initialized) { /* SSL3 and TLS */ |
| 36 /* now we know this socket went through ssl3_InitState() and | 26 /* now we know this socket went through ssl3_InitState() and |
| 37 * ss->xtnData got initialized, which is the only member accessed by | 27 * ss->xtnData got initialized, which is the only member accessed by |
| OLD | NEW |