Update to NSS 3.14.3 Beta 1 for the TLS CBC constant-time

mozilla/security/nss/lib/freebl/sha_fast.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/. */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
 #endif
 
 #include <memory.h>
 #include "blapi.h"
@@ skipping 130 matching lines @@
 
 /*
  *  SHA: Generate hash value from context
  */
 void 
 SHA1_End(SHA1Context *ctx, unsigned char *hashout,
          unsigned int *pDigestLen, unsigned int maxDigestLen)
 {
   register PRUint64 size;
   register PRUint32 lenB;
+  PRUint32 tmpbuf[5];
 
   static const unsigned char bulk_pad[64] = { 0x80,0,0,0,0,0,0,0,0,0,
           0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
           0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  };
 #define tmp lenB
 
   PORT_Assert (maxDigestLen >= SHA1_LENGTH);
 
   /*
    *  Pad with a binary 1 (e.g. 0x80), then zeroes, then length in bits
    */
   size = ctx->size;
 
   lenB = (PRUint32)size & 63;
   SHA1_Update(ctx, bulk_pad, (((55+64) - lenB) & 63) + 1);
   PORT_Assert(((PRUint32)ctx->size & 63) == 56);
   /* Convert size from bytes to bits. */
   size <<= 3;
   ctx->W[14] = SHA_HTONL((PRUint32)(size >> 32));
   ctx->W[15] = SHA_HTONL((PRUint32)size);
   shaCompress(&ctx->H[H2X], ctx->W);
 
   /*
    *  Output hash
    */
   SHA_STORE_RESULT;
-  *pDigestLen = SHA1_LENGTH;
+  if (pDigestLen) {
+    *pDigestLen = SHA1_LENGTH;
+  }
+#undef tmp
+}
 
+void
+SHA1_EndRaw(SHA1Context *ctx, unsigned char *hashout,
+            unsigned int *pDigestLen, unsigned int maxDigestLen)
+{
+#if defined(SHA_NEED_TMP_VARIABLE)
+  register PRUint32 tmp;
+#endif
+  PRUint32 tmpbuf[5];
+  PORT_Assert (maxDigestLen >= SHA1_LENGTH);
+
+  SHA_STORE_RESULT;
+  if (pDigestLen)
+    *pDigestLen = SHA1_LENGTH;
 }
 
 #undef B
-#undef tmp
 /*
  *  SHA: Compression function, unrolled.
  *
  * Some operations in shaCompress are done as 5 groups of 16 operations.
  * Others are done as 4 groups of 20 operations.
  * The code below shows that structure.
  *
  * The functions that compute the new values of the 5 state variables
  * A-E are done in 4 groups of 20 operations (or you may also think
  * of them as being done in 16 groups of 5 operations).  They are
@@ skipping 244 matching lines @@
 void SHA1_Clone(SHA1Context *dest, SHA1Context *src) 
 {
     memcpy(dest, src, sizeof *dest);
 }
 
 void
 SHA1_TraceState(SHA1Context *ctx)
 {
     PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
 }