OLD | NEW |
(Empty) | |
| 1 Index: mozilla/security/nss/lib/ssl/sslreveal.c |
| 2 =================================================================== |
| 3 RCS file: /cvsroot/mozilla/security/nss/lib/ssl/sslreveal.c,v |
| 4 retrieving revision 1.8 |
| 5 diff -u -p -u -8 -r1.8 sslreveal.c |
| 6 --- mozilla/security/nss/lib/ssl/sslreveal.c 3 Aug 2010 18:48:45 -0000
1.8 |
| 7 +++ mozilla/security/nss/lib/ssl/sslreveal.c 25 Aug 2011 00:48:18 -0000 |
| 8 @@ -106,36 +106,29 @@ SSL_RevealURL(PRFileDesc * fd) |
| 9 SECStatus |
| 10 SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, |
| 11 SSLExtensionType extId, |
| 12 PRBool *pYes) |
| 13 { |
| 14 /* some decisions derived from SSL_GetChannelInfo */ |
| 15 sslSocket * sslsocket = NULL; |
| 16 SECStatus rv = SECFailure; |
| 17 - PRBool enoughFirstHsDone = PR_FALSE; |
| 18 |
| 19 if (!pYes) |
| 20 return rv; |
| 21 |
| 22 sslsocket = ssl_FindSocket(socket); |
| 23 if (!sslsocket) { |
| 24 SSL_DBG(("%d: SSL[%d]: bad socket in HandshakeNegotiatedExtension", |
| 25 SSL_GETPID(), socket)); |
| 26 return rv; |
| 27 } |
| 28 |
| 29 - if (sslsocket->firstHsDone) { |
| 30 - enoughFirstHsDone = PR_TRUE; |
| 31 - } else if (sslsocket->ssl3.initialized && ssl3_CanFalseStart(sslsocket)) { |
| 32 - enoughFirstHsDone = PR_TRUE; |
| 33 - } |
| 34 - |
| 35 /* according to public API SSL_GetChannelInfo, this doesn't need a lock */ |
| 36 - if (sslsocket->opt.useSecurity && enoughFirstHsDone) { |
| 37 + if (sslsocket->opt.useSecurity) { |
| 38 if (sslsocket->ssl3.initialized) { /* SSL3 and TLS */ |
| 39 /* now we know this socket went through ssl3_InitState() and |
| 40 * ss->xtnData got initialized, which is the only member accessed by |
| 41 * ssl3_ExtensionNegotiated(); |
| 42 * Member xtnData appears to get accessed in functions that handle |
| 43 * the handshake (hello messages and extension sending), |
| 44 * therefore the handshake lock should be sufficient. |
| 45 */ |
OLD | NEW |