net: add NSS support for RFC 5705

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 8424 matching lines @@
         ssl_GetRecvBufLock(ss);
         if (ss->ssl3.hs.msgState.buf != NULL) {
             rv = ssl3_HandleRecord(ss, NULL, &ss->gs.buf);
         }
         ssl_ReleaseRecvBufLock(ss);
     }
 
     return rv;
 }
 
-static SECStatus
-ssl3_ComputeTLSFinished(ssl3CipherSpec *spec,
-                        PRBool          isServer,
-                const   SSL3Finished *  hashes,
-                        TLSFinished  *  tlsFinished)
+/* 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.
+ */
+SECStatus
+ssl3_TLSPRFWithMasterSecret(ssl3CipherSpec *spec, const char *label,
+    unsigned int labelLen, const unsigned char *val, unsigned int valLen,
+    unsigned char *out, unsigned int outLen)
 {
-    const char * label;
-    unsigned int len;
-    SECStatus    rv;
-
-    label = isServer ? "server finished" : "client finished";
-    len   = 15;
+    SECStatus rv = SECSuccess;
+    unsigned int retLen;
 
     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);
         if (!prf_context)
             return SECFailure;
 
         rv  = PK11_DigestBegin(prf_context);
-        rv |= PK11_DigestOp(prf_context, (const unsigned char *) label, len);
-        rv |= PK11_DigestOp(prf_context, hashes->md5, sizeof *hashes);
-        rv |= PK11_DigestFinal(prf_context, tlsFinished->verify_data, 
-                               &len, sizeof tlsFinished->verify_data);
-        PORT_Assert(rv != SECSuccess || len == sizeof *tlsFinished);
+        rv |= PK11_DigestOp(prf_context, (unsigned char *) label, labelLen);
+        rv |= PK11_DigestOp(prf_context, val, valLen);
+        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 *)hashes->md5;
-        inData.len   = sizeof hashes[0];
-        outData.data = tlsFinished->verify_data;
-        outData.len  = sizeof tlsFinished->verify_data;
+        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 == sizeof tlsFinished->verify_data);
+        PORT_Assert(rv != SECSuccess || outData.len == outLen);
     }
     return rv;
 }
 
+static SECStatus
+ssl3_ComputeTLSFinished(ssl3CipherSpec *spec,
+                        PRBool          isServer,
+                const   SSL3Finished *  hashes,
+                        TLSFinished  *  tlsFinished)
+{
+    const char * label;
+    SECStatus    rv;
+
+    label = isServer ? "server finished" : "client finished";
+
+    rv = ssl3_TLSPRFWithMasterSecret(spec, label, 15, hashes->md5,
+        sizeof *hashes, tlsFinished->verify_data,
+        sizeof tlsFinished->verify_data);
+
+    return rv;
+}
+
 /* called from ssl3_HandleServerHelloDone
  */
 static SECStatus
 ssl3_SendNextProto(sslSocket *ss)
 {
     SECStatus rv;
     int padding_len;
     static const unsigned char padding[32] = {0};
 
     if (ss->ssl3.nextProtoState == SSL_NEXT_PROTO_NO_SUPPORT)
@@ skipping 1432 matching lines @@
 
     ss->ssl3.initialized = PR_FALSE;
 
     if (ss->ssl3.nextProto.data) {
         PORT_Free(ss->ssl3.nextProto.data);
         ss->ssl3.nextProto.data = NULL;
     }
 }
 
 /* End of ssl3con.c */