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

Bug 595134: let sftk_searchTokenList skip sftk_searchDatabase where the

Browse Source 
object won't be found.  Declare the ulCount variables as CK_ULONG instead
of CK_LONG.  Fix a bug where the failure of the sftk_emailhack call in
sftk_searchTokenList was ignored.  r=rrelyea.


git-svn-id: svn://10.0.0.236/trunk@261789 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com
2011-01-22 00:12:04 +00:00
parent 1776b2d762
commit 14309d2c8c
1 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
mozilla/security/nss/lib/softoken/pkcs11.c
View File

@@ -4322,7 +4322,7 @@ sftk_expandSearchList(SFTKSearchResults *search, int count)
static CK_RV
sftk_searchDatabase(SFTKDBHandle *handle, SFTKSearchResults *search,
const CK_ATTRIBUTE *pTemplate, CK_LONG ulCount)
const CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount)
{
CK_RV crv;
int objectListSize = search->array_size-search->size;
@@ -4356,7 +4356,7 @@ sftk_searchDatabase(SFTKDBHandle *handle, SFTKSearchResults *search,
*/
CK_RV
sftk_emailhack(SFTKSlot *slot, SFTKDBHandle *handle,
SFTKSearchResults *search, CK_ATTRIBUTE *pTemplate, CK_LONG ulCount)
SFTKSearchResults *search, CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount)
{
PRBool isCert = PR_FALSE;
int emailIndex = -1;
@@ -4445,22 +4445,47 @@ loser:
return crv;
}
static void
sftk_pruneSearch(CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount,
PRBool *searchCertDB, PRBool *searchKeyDB) {
CK_ULONG i;
*searchCertDB = PR_TRUE;
*searchKeyDB = PR_TRUE;
for (i = 0; i < ulCount; i++) {
if (pTemplate[i].type == CKA_CLASS && pTemplate[i].pValue != NULL) {
CK_OBJECT_CLASS class = *((CK_OBJECT_CLASS*)pTemplate[i].pValue);
if (class == CKO_PRIVATE_KEY || class == CKO_SECRET_KEY) {
*searchCertDB = PR_FALSE;
} else {
*searchKeyDB = PR_FALSE;
}
break;
}
}
}
static CK_RV
sftk_searchTokenList(SFTKSlot *slot, SFTKSearchResults *search,
CK_ATTRIBUTE *pTemplate, CK_LONG ulCount,
CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount,
PRBool *tokenOnly, PRBool isLoggedIn)
{
CK_RV crv;
CK_RV crv = CKR_OK;
CK_RV crv2;
SFTKDBHandle *certHandle = sftk_getCertDB(slot);
PRBool searchCertDB;
PRBool searchKeyDB;
sftk_pruneSearch(pTemplate, ulCount, &searchCertDB, &searchKeyDB);
crv = sftk_searchDatabase(certHandle, search, pTemplate, ulCount);
crv2 = sftk_emailhack(slot, certHandle, search, pTemplate, ulCount);
if (crv == CKR_OK) crv2 = crv;
sftk_freeDB(certHandle);
if (searchCertDB) {
SFTKDBHandle *certHandle = sftk_getCertDB(slot);
crv = sftk_searchDatabase(certHandle, search, pTemplate, ulCount);
crv2 = sftk_emailhack(slot, certHandle, search, pTemplate, ulCount);
if (crv == CKR_OK) crv = crv2;
sftk_freeDB(certHandle);
}
if (crv == CKR_OK && isLoggedIn) {
if (crv == CKR_OK && isLoggedIn && searchKeyDB) {
SFTKDBHandle *keyHandle = sftk_getKeyDB(slot);
crv = sftk_searchDatabase(keyHandle, search, pTemplate, ulCount);
sftk_freeDB(keyHandle);