Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 587421: PK11_PBEKeyGen leaks param because it checks type too late

Browse Source 
Patch contributed by Bob Relyea <rrelyea@redhat.com>, r=nelson


git-svn-id: svn://10.0.0.236/trunk@261758 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelson%bolyard.com 2011-01-15 20:10:13 +00:00
parent 82ffdf2e33
commit 8b44da4130
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/security/nss/lib/pk11wrap/pk11pbe.c
View File

@ -1348,7 +1348,7 @@ PK11_PBEKeyGen(PK11SlotInfo *slot, SECAlgorithmID *algid, SECItem *pwitem,
{
CK_MECHANISM_TYPE type;
SECItem *param = NULL;
PK11SymKey *symKey;
PK11SymKey *symKey = NULL;
SECOidTag pbeAlg;
CK_KEY_TYPE keyType = -1;
int keyLen = 0;
@ -1377,14 +1377,15 @@ PK11_PBEKeyGen(PK11SlotInfo *slot, SECAlgorithmID *algid, SECItem *pwitem,
} else {
param = PK11_ParamFromAlgid(algid);
}
if(param == NULL) {
return NULL;
goto loser;
}
type = PK11_AlgtagToMechanism(pbeAlg);
if (type == CKM_INVALID_MECHANISM) {
PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
return NULL;
goto loser;
}
if(faulty3DES && (type == CKM_NETSCAPE_PBE_SHA1_TRIPLE_DES_CBC)) {
type = CKM_NETSCAPE_PBE_SHA1_FAULTY_3DES_CBC;
@ -1392,7 +1393,10 @@ PK11_PBEKeyGen(PK11SlotInfo *slot, SECAlgorithmID *algid, SECItem *pwitem,
symKey = pk11_RawPBEKeyGenWithKeyType(slot, type, param, keyType, keyLen,
pwitem, wincx);
SECITEM_ZfreeItem(param, PR_TRUE);
loser:
if (param) {
SECITEM_ZfreeItem(param, PR_TRUE);
}
return symKey;
}