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

Unified Diff: mozilla/security/nss/lib/freebl/sha_fast.c

Issue 12207073: Update to NSS 3.14.3 Beta 1 for the TLS CBC constant-time (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 10 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
Index: mozilla/security/nss/lib/freebl/sha_fast.c
===================================================================
--- mozilla/security/nss/lib/freebl/sha_fast.c (revision 180595)
+++ mozilla/security/nss/lib/freebl/sha_fast.c (working copy)
@@ -148,6 +148,7 @@
{
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,
@@ -174,12 +175,28 @@
* 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.
*

Powered by Google App Engine
This is Rietveld 408576698