diff options
| author | Brian Smith <bsmith@mozilla.com> | 2013-05-02 19:32:59 -0700 |
|---|---|---|
| committer | Brian Smith <bsmith@mozilla.com> | 2013-05-02 19:32:59 -0700 |
| commit | 359b2406b30bf028934a8cbdd30bb0588cf2ad6c (patch) | |
| tree | f705e1e5ec0cb241973ddc42db9950e143fd416a /cmd/fipstest | |
| parent | a8f69677908f03825d56c4fbc8bc819a51243a05 (diff) | |
| download | nss-hg-359b2406b30bf028934a8cbdd30bb0588cf2ad6c.tar.gz | |
Bug 802430: Allow NSS to be built with NO_NSPR_10_SUPPORT, r=wtc
Diffstat (limited to 'cmd/fipstest')
| -rw-r--r-- | cmd/fipstest/fipstest.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cmd/fipstest/fipstest.c b/cmd/fipstest/fipstest.c index b3e7f56e4..13b694f51 100644 --- a/cmd/fipstest/fipstest.c +++ b/cmd/fipstest/fipstest.c @@ -26,7 +26,7 @@ extern SECStatus EC_DecodeParams(const SECItem *encodedParams, ECParams **ecparams); extern SECStatus -EC_CopyParams(PRArenaPool *arena, ECParams *dstParams, +EC_CopyParams(PLArenaPool *arena, ECParams *dstParams, const ECParams *srcParams); #endif @@ -3311,19 +3311,19 @@ sha_get_hashType(int hashbits) switch (hashbits) { case 1: - case (SHA1_LENGTH*BITS_PER_BYTE): + case (SHA1_LENGTH*PR_BITS_PER_BYTE): hashType = HASH_AlgSHA1; break; - case (SHA224_LENGTH*BITS_PER_BYTE): + case (SHA224_LENGTH*PR_BITS_PER_BYTE): hashType = HASH_AlgSHA224; break; - case (SHA256_LENGTH*BITS_PER_BYTE): + case (SHA256_LENGTH*PR_BITS_PER_BYTE): hashType = HASH_AlgSHA256; break; - case (SHA384_LENGTH*BITS_PER_BYTE): + case (SHA384_LENGTH*PR_BITS_PER_BYTE): hashType = HASH_AlgSHA384; break; - case (SHA512_LENGTH*BITS_PER_BYTE): + case (SHA512_LENGTH*PR_BITS_PER_BYTE): hashType = HASH_AlgSHA512; break; default: @@ -3342,7 +3342,7 @@ sha_get_hashType(int hashbits) */ SECStatus sha_calcMD(unsigned char *MD, unsigned int MDLen, unsigned char *msg, unsigned int msgLen) { - HASH_HashType hashType = sha_get_hashType(MDLen*BITS_PER_BYTE); + HASH_HashType hashType = sha_get_hashType(MDLen*PR_BITS_PER_BYTE); return fips_hashBuf(hashType, MD, msg, msgLen); } @@ -3661,7 +3661,7 @@ void hmac_test(char *reqfn) } /* HMACLen will get reused for Tlen */ HMACLen = atoi(&buf[i]); - hash_alg = sha_get_hashType(HMACLen*BITS_PER_BYTE); + hash_alg = sha_get_hashType(HMACLen*PR_BITS_PER_BYTE); if (hash_alg == HASH_AlgNULL) { goto loser; } |