From 577e6655d4edc789eb4c572b303daf888676a454 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Mon, 3 Oct 2011 12:27:21 -0400 Subject: [PATCH] negotiatedextension.patch --- mozilla/security/nss/lib/ssl/sslreveal.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/mozilla/security/nss/lib/ssl/sslreveal.c b/mozilla/security/nss/lib/ssl/sslreveal.c index 94b2c2f..0b9bb82 100644 --- a/mozilla/security/nss/lib/ssl/sslreveal.c +++ b/mozilla/security/nss/lib/ssl/sslreveal.c @@ -111,7 +111,6 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, /* some decisions derived from SSL_GetChannelInfo */ sslSocket * sslsocket = NULL; SECStatus rv = SECFailure; - PRBool enoughFirstHsDone = PR_FALSE; if (!pYes) return rv; @@ -123,14 +122,8 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, return rv; } - if (sslsocket->firstHsDone) { - enoughFirstHsDone = PR_TRUE; - } else if (sslsocket->ssl3.initialized && ssl3_CanFalseStart(sslsocket)) { - enoughFirstHsDone = PR_TRUE; - } - /* according to public API SSL_GetChannelInfo, this doesn't need a lock */ - if (sslsocket->opt.useSecurity && enoughFirstHsDone) { + if (sslsocket->opt.useSecurity) { if (sslsocket->ssl3.initialized) { /* SSL3 and TLS */ /* now we know this socket went through ssl3_InitState() and * ss->xtnData got initialized, which is the only member accessed by