diff options
| author | nelsonb%netscape.com <devnull@localhost> | 2005-08-09 02:54:54 +0000 |
|---|---|---|
| committer | nelsonb%netscape.com <devnull@localhost> | 2005-08-09 02:54:54 +0000 |
| commit | 80b6091cdf6a9f327adf15a9954cc7922d2e5d46 (patch) | |
| tree | 15dec0c18a0c90410646d7d20db0a13e7f30717f /security/nss/lib/softoken | |
| parent | c235998388501e4cf1f23144a6d4b64faa422982 (diff) | |
| download | nss-hg-80b6091cdf6a9f327adf15a9954cc7922d2e5d46.tar.gz | |
Make changes from review feedback. Bug 303316. r=wtchang.
Modified Files: freebl/alghmac.h freebl/blapi.h freebl/ldvector.c
freebl/loader.c freebl/loader.h freebl/rawhash.c
freebl/tlsprfalg.c softoken/lowpbe.c softoken/pkcs11c.c
Diffstat (limited to 'security/nss/lib/softoken')
| -rw-r--r-- | security/nss/lib/softoken/lowpbe.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/softoken/pkcs11c.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/softoken/lowpbe.c b/security/nss/lib/softoken/lowpbe.c index 09c00f6bc..8f173b271 100644 --- a/security/nss/lib/softoken/lowpbe.c +++ b/security/nss/lib/softoken/lowpbe.c @@ -587,7 +587,7 @@ nsspkcs5_ComputeKeyAndIV(NSSPKCS5PBEParameter *pbe_param, SECItem *pwitem, iv->len = pbe_param->ivLen; } - hashObj = SEC_GetRawHashObject(pbe_param->hashType); + hashObj = HASH_GetRawHashObject(pbe_param->hashType); switch (pbe_param->pbeType) { case NSSPKCS5_PBKDF1: hash = nsspkcs5_PBKDF1Extended(hashObj,pbe_param,pwitem,faulty3DES); diff --git a/security/nss/lib/softoken/pkcs11c.c b/security/nss/lib/softoken/pkcs11c.c index fdcfdce68..ba9ed875d 100644 --- a/security/nss/lib/softoken/pkcs11c.c +++ b/security/nss/lib/softoken/pkcs11c.c @@ -1266,7 +1266,7 @@ sftk_doHMACInit(SFTKSessionContext *context,HASH_HashType hash, SFTKAttribute *keyval; HMACContext *HMACcontext; CK_ULONG *intpointer; - const SECHashObject *hashObj = SEC_GetRawHashObject(hash); + const SECHashObject *hashObj = HASH_GetRawHashObject(hash); PRBool isFIPS = (key->slot->slotID == FIPS_SLOT_ID); /* required by FIPS 198 Section 4 */ |