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

Bug 427706 resolve regression from bug 427706.

Browse Source 
This also includes reapplying the patch from 427706
r=kaie


git-svn-id: svn://10.0.0.236/trunk@251944 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rrelyea%redhat.com 2008-05-29 21:45:07 +00:00
parent 48b022bddc
commit 459ab5590b
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mozilla/security/nss/lib/pk11wrap/pk11sdr.c
View File

@ -136,6 +136,10 @@ unpadBlock(SECItem *data, int blockSize, SECItem *result)
PORT_Memcpy(result->data, data->data, result->len);
if (padLength < 2) {
return SECWouldBlock;
}
loser:
return rv;
}
@ -310,9 +314,9 @@ PK11SDR_Decrypt(SECItem *data, SECItem *result, void *cx)
CK_MECHANISM_TYPE type;
SDRResult sdrResult;
SECItem *params = 0;
SECItem possibleResult = { 0, NULL, 0 };
PLArenaPool *arena = 0;
arena = PORT_NewArena(SEC_ASN1_DEFAULT_ARENA_SIZE);
if (!arena) { rv = SECFailure; goto loser; }
@ -341,6 +345,17 @@ PK11SDR_Decrypt(SECItem *data, SECItem *result, void *cx)
rv = pk11Decrypt(slot, arena, type, key, params,
&sdrResult.data, result);
}
/*
* if the pad value was too small (1 or 2), then it's statistically
* 'likely' that (1 in 256) that we may not have the correct key.
* Check the other keys for a better match. If we find none, use
* this result.
*/
if (rv == SECWouldBlock) {
possibleResult = *result;
}
/*
* handle the case where your key indicies may have been broken
*/
@ -355,6 +370,18 @@ PK11SDR_Decrypt(SECItem *data, SECItem *result, void *cx)
&sdrResult.data, result);
if (rv == SECSuccess) {
break;
}
/* found a close match. If it's our first remember it */
if (rv == SECWouldBlock) {
if (possibleResult.data) {
/* this is unlikely but possible. If we hit this condition,
* we have no way of knowing which possibility to prefer.
* in this case we just match the key the application
* thought was the right one */
SECITEM_ZfreeItem(result, PR_FALSE);
} else {
possibleResult = *result;
}
}
}
@ -365,14 +392,19 @@ PK11SDR_Decrypt(SECItem *data, SECItem *result, void *cx)
}
}
/* we didn't find a better key, use the one with a small pad value */
if ((rv != SECSuccess) && (possibleResult.data)) {
*result = possibleResult;
possibleResult.data = NULL;
rv = SECSuccess;
}
loser:
/* SECITEM_ZfreeItem(&paddedResult, PR_FALSE); */
if (arena) PORT_FreeArena(arena, PR_TRUE);
if (key) PK11_FreeSymKey(key);
if (params) SECITEM_ZfreeItem(params, PR_TRUE);
if (slot) PK11_FreeSlot(slot);
if (possibleResult.data) SECITEM_ZfreeItem(&possibleResult, PR_FALSE);
return rv;
}