diff options
| author | Wan-Teh Chang <wtc@google.com> | 2013-09-23 11:25:41 -0700 |
|---|---|---|
| committer | Wan-Teh Chang <wtc@google.com> | 2013-09-23 11:25:41 -0700 |
| commit | c6e0cc00ecd56af27112810b8cd6c3860412ad03 (patch) | |
| tree | 470bfb3b7296e676d0b98faf5d532aa492aedc1e | |
| parent | 645fb5e2e7d46a8c15c46054fb4c2d3ca0329d0a (diff) | |
| download | nss-hg-c6e0cc00ecd56af27112810b8cd6c3860412ad03.tar.gz | |
Bug 681839: Allow SSL_HandshakeNegotiatedExtension to be called before the handshake is finished, r=brian@briansmith.org
| -rw-r--r-- | lib/ssl/sslreveal.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/ssl/sslreveal.c b/lib/ssl/sslreveal.c index dc14794bd..d97299885 100644 --- a/lib/ssl/sslreveal.c +++ b/lib/ssl/sslreveal.c @@ -77,7 +77,6 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, { /* some decisions derived from SSL_GetChannelInfo */ sslSocket * sslsocket = NULL; - PRBool enoughFirstHsDone = PR_FALSE; if (!pYes) { PORT_SetError(SEC_ERROR_INVALID_ARGS); @@ -93,14 +92,8 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, *pYes = PR_FALSE; - 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 |