Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1088)

Unified Diff: net/third_party/nss/ssl/sslreveal.c

Issue 7746010: Allow SSL_HandshakeNegotiatedExtension to be called before the handshake (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/third_party/nss/patches/negotiatedextension.patch ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/ssl/sslreveal.c
===================================================================
--- net/third_party/nss/ssl/sslreveal.c (revision 98154)
+++ net/third_party/nss/ssl/sslreveal.c (working copy)
@@ -111,7 +111,6 @@
/* some decisions derived from SSL_GetChannelInfo */
sslSocket * sslsocket = NULL;
SECStatus rv = SECFailure;
- PRBool enoughFirstHsDone = PR_FALSE;
if (!pYes)
return rv;
@@ -123,14 +122,8 @@
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
« no previous file with comments | « net/third_party/nss/patches/negotiatedextension.patch ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698