Make SSL False Start work with asynchronous certificate validation

net/third_party/nss/ssl/sslinfo.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "ssl.h"
 #include "sslimpl.h"
 #include "sslproto.h"
 
 static const char *
 ssl_GetCompressionMethodName(SSLCompressionMethod compression)
 {
     switch (compression) {
     case ssl_compression_null:
         return "NULL";
 #ifdef NSS_ENABLE_ZLIB
     case ssl_compression_deflate:
         return "DEFLATE";
 #endif
     default:
         return "???";
     }
 }
 
 SECStatus 
 SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info, PRUintn len)
 {
     sslSocket *      ss;
     SSLChannelInfo   inf;
     sslSessionID *   sid;
-    PRBool           enoughFirstHsDone = PR_FALSE;
 
     if (!info || len < sizeof inf.length) { 
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     }
 
     ss = ssl_FindSocket(fd);
     if (!ss) {
         SSL_DBG(("%d: SSL[%d]: bad socket in SSL_GetChannelInfo",
                  SSL_GETPID(), fd));
         return SECFailure;
     }
 
     memset(&inf, 0, sizeof inf);
     inf.length = PR_MIN(sizeof inf, len);
 
-    if (ss->firstHsDone) {
-        enoughFirstHsDone = PR_TRUE;
-    } else if (ss->version >= SSL_LIBRARY_VERSION_3_0 &&
-               ssl3_CanFalseStart(ss)) {
-        enoughFirstHsDone = PR_TRUE;
-    }
-
-    if (ss->opt.useSecurity && enoughFirstHsDone) {
+    if (ss->opt.useSecurity && ss->enoughFirstHsDone) {
         sid = ss->sec.ci.sid;
         inf.protocolVersion  = ss->version;
         inf.authKeyBits      = ss->sec.authKeyBits;
         inf.keaKeyBits       = ss->sec.keaKeyBits;
         if (ss->version < SSL_LIBRARY_VERSION_3_0) { /* SSL2 */
             inf.cipherSuite           = ss->sec.cipherType | 0xff00;
             inf.compressionMethod     = ssl_compression_null;
             inf.compressionMethodName = "N/A";
         } else if (ss->ssl3.initialized) {      /* SSL3 and TLS */
             ssl_GetSpecReadLock(ss);
@@ skipping 344 matching lines @@
         rv = ssl3_TLSPRFWithMasterSecret(ss->ssl3.cwSpec, label, labelLen, val,
                                          valLen, out, outLen);
     }
     ssl_ReleaseSpecReadLock(ss);
     ssl_ReleaseSSL3HandshakeLock(ss);
     ssl_ReleaseRecvBufLock(ss);
 
     PORT_ZFree(val, valLen);
     return rv;
 }