Bug 822365: the SHA_HTONL macro (used by the SHA_STORE_RESULT macro) needs

a local variable named 'tmp' in some build configurations. Undefine 'tmp'
as 'lenB' at the end of SHA1_End. r=kaie.


git-svn-id: svn://10.0.0.236/trunk@264694 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com 2013-02-05 23:46:39 +00:00
parent 3e09cf75c5
commit 7aa47e4fd0

View File

@ -178,12 +178,16 @@ SHA1_End(SHA1Context *ctx, unsigned char *hashout,
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);
@ -193,7 +197,6 @@ SHA1_EndRaw(SHA1Context *ctx, unsigned char *hashout,
}
#undef B
#undef tmp
/*
* SHA: Compression function, unrolled.
*