Add a boolean |had_context| argument to the TLS ExportKeyingMaterial

net/third_party/nss/ssl/ssl3con.c

 /*
  * SSL3 Protocol
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
@@ skipping 8466 matching lines @@
         rv = SECSuccess;
     }
 
 done:
     ssl_ReleaseSSL3HandshakeLock(ss);
     ssl_ReleaseRecvBufLock(ss);
 
     return rv;
 }
 
-/* The calling function must acquire and release the appropriate lock (i.e.,
- * ssl_GetSpecReadLock / ssl_ReleaseSpecReadLock for ss->ssl3.crSpec). Any
- * label must already be concatenated onto the beginning of val.
+/* The calling function must acquire and release the appropriate
+ * lock (e.g., ssl_GetSpecReadLock / ssl_ReleaseSpecReadLock for
+ * ss->ssl3.crSpec).
  */
 SECStatus
 ssl3_TLSPRFWithMasterSecret(ssl3CipherSpec *spec, const char *label,
     unsigned int labelLen, const unsigned char *val, unsigned int valLen,
     unsigned char *out, unsigned int outLen)
 {
     SECStatus rv = SECSuccess;
 
     if (spec->master_secret && !spec->bypassCiphers) {
         SECItem      param       = {siBuffer, NULL, 0};
         PK11Context *prf_context =
             PK11_CreateContextBySymKey(CKM_TLS_PRF_GENERAL, CKA_SIGN, 
                                        spec->master_secret, &param);
         unsigned int retLen;
 
         if (!prf_context)
             return SECFailure;
 
         rv  = PK11_DigestBegin(prf_context);
         rv |= PK11_DigestOp(prf_context, (unsigned char *) label, labelLen);
         rv |= PK11_DigestOp(prf_context, val, valLen);
-        rv |= PK11_DigestFinal(prf_context, out,
-                               &retLen, outLen);
+        rv |= PK11_DigestFinal(prf_context, out, &retLen, outLen);
         PORT_Assert(rv != SECSuccess || retLen == outLen);
 
         PK11_DestroyContext(prf_context, PR_TRUE);
     } else {
         /* bypass PKCS11 */
         SECItem inData  = { siBuffer, };
         SECItem outData = { siBuffer, };
         PRBool isFIPS   = PR_FALSE;
 
         inData.data  = (unsigned char *) val;
         inData.len   = valLen;
         outData.data = out;
         outData.len  = outLen;
         rv = TLS_PRF(&spec->msItem, label, &inData, &outData, isFIPS);
         PORT_Assert(rv != SECSuccess || outData.len == outLen);
     }
     return rv;
 }
 
 static SECStatus
 ssl3_ComputeTLSFinished(ssl3CipherSpec *spec,
                         PRBool          isServer,
-                const   SSL3Finished *  hashes,
-                        TLSFinished  *  tlsFinished)
+                const   SSL3Finished *  hashes,
+                        TLSFinished  *  tlsFinished)
 {
     const char * label;
+    unsigned int len;
     SECStatus    rv;
-    unsigned int len;
 
     label = isServer ? "server finished" : "client finished";
-    len = 15;
+    len   = 15;
 
     rv = ssl3_TLSPRFWithMasterSecret(spec, label, len, hashes->md5,
         sizeof *hashes, tlsFinished->verify_data,
         sizeof tlsFinished->verify_data);
 
     return rv;
 }
 
 /* called from ssl3_HandleServerHelloDone
  */
@@ skipping 1433 matching lines @@
     /* free up the CipherSpecs */
     ssl3_DestroyCipherSpec(&ss->ssl3.specs[0], PR_TRUE/*freeSrvName*/);
     ssl3_DestroyCipherSpec(&ss->ssl3.specs[1], PR_TRUE/*freeSrvName*/);
 
     ss->ssl3.initialized = PR_FALSE;
 
     SECITEM_FreeItem(&ss->ssl3.nextProto, PR_FALSE);
 }
 
 /* End of ssl3con.c */