Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 03:05:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugzilla bug 135809: fixed the slot reference leaks in PBE_CreateContext

Browse Source 
and SEC_PKCS5GetIV.  r=relyea.
This commit is contained in:
wtc%netscape.com 2002-05-09 23:21:16 +00:00
parent 061d6e0d0c
commit 9c38dd9727
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/nss/lib/pk11wrap/pk11pbe.c
View File

@ -504,6 +504,7 @@ PBE_CreateContext(SECOidTag hashAlgorithm, PBEBitGenID bitGenPurpose,
SECItem mechItem;
CK_PBE_PARAMS pbe_params;
CK_MECHANISM_TYPE mechanism = CKM_INVALID_MECHANISM;
PK11SlotInfo *slot;
PK11SymKey *symKey = NULL;
unsigned char ivData[8];
@ -567,8 +568,10 @@ PBE_CreateContext(SECOidTag hashAlgorithm, PBEBitGenID bitGenPurpose,
mechItem.len = sizeof(pbe_params);
symKey = PK11_RawPBEKeyGen(PK11_GetInternalSlot(),mechanism,
slot = PK11_GetInternalSlot();
symKey = PK11_RawPBEKeyGen(slot,mechanism,
&mechItem, pwitem, PR_FALSE, NULL);
PK11_FreeSlot(slot);
if (symKey != NULL) {
if (bitGenPurpose == pbeBitGenCipherIV) {
/* NOTE: this assumes that bitsNeeded is a multiple of 8! */
@ -615,6 +618,7 @@ SEC_PKCS5GetIV(SECAlgorithmID *algid, SECItem *pwitem, PRBool faulty3DES)
SECItem *iv = NULL;
SECStatus rv;
int iv_len;
PK11SlotInfo *slot;
PK11SymKey *symKey;
rv = pbe_PK11AlgidToParam(algid,&mechItem);
@ -626,8 +630,10 @@ SEC_PKCS5GetIV(SECAlgorithmID *algid, SECItem *pwitem, PRBool faulty3DES)
iv_len = PK11_GetIVLength(mechanism);
pbe_params = (CK_PBE_PARAMS_PTR)mechItem.data;
symKey = PK11_RawPBEKeyGen(PK11_GetInternalSlot(),mechanism,
slot = PK11_GetInternalSlot();
symKey = PK11_RawPBEKeyGen(slot,mechanism,
&mechItem, pwitem, faulty3DES,NULL);
PK11_FreeSlot(slot);
if (symKey) {
SECItem tmp;