diff options
| author | nelson%bolyard.com <devnull@localhost> | 2007-10-10 07:23:59 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2007-10-10 07:23:59 +0000 |
| commit | 848544a0f7cf58fb17561be85bcba95de9b0f78f (patch) | |
| tree | 8512990564b6782b95b51643ee1cf76b0f03274d /security/nss/lib/softoken | |
| parent | c1acf261fecdd32f103a4d4eaf5855a87d9bb568 (diff) | |
| download | nss-hg-848544a0f7cf58fb17561be85bcba95de9b0f78f.tar.gz | |
Bug 353714, key search functions ignore the nickname argument, r=rrelyea
Diffstat (limited to 'security/nss/lib/softoken')
| -rw-r--r-- | security/nss/lib/softoken/legacydb/lgfind.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/security/nss/lib/softoken/legacydb/lgfind.c b/security/nss/lib/softoken/legacydb/lgfind.c index b7029c7d5..e97f9c17a 100644 --- a/security/nss/lib/softoken/legacydb/lgfind.c +++ b/security/nss/lib/softoken/legacydb/lgfind.c @@ -206,7 +206,7 @@ lg_key_collect(DBT *key, DBT *data, void *arg) tmpDBKey.type = siBuffer; PORT_Assert(keyData->keyHandle); - if (!keyData->strict && keyData->id) { + if (!keyData->strict && keyData->id && keyData->id->data) { SECItem result; PRBool haveMatch= PR_FALSE; unsigned char hashKey[SHA1_LENGTH]; @@ -666,8 +666,7 @@ lg_searchTokenList(SDB *sdb, SDBFind *search, CK_CERTIFICATE_TYPE certType; CK_OBJECT_CLASS objectClass; CK_RV crv; - unsigned long classFlags = - LG_CERT|LG_TRUST|LG_PRIVATE|LG_PUBLIC|LG_KEY|LG_SMIME|LG_CRL; + unsigned long classFlags; if (lg_getCertDB(sdb) == NULL) { classFlags = LG_PRIVATE|LG_KEY; @@ -846,7 +845,7 @@ lg_searchTokenList(SDB *sdb, SDBFind *search, /* keys */ if (classFlags & (LG_PRIVATE|LG_PUBLIC|LG_KEY)) { - PRBool mustStrict = ((classFlags & LG_KEY) != 0) && (name.len != 0); + PRBool mustStrict = (name.len != 0); lg_searchKeys(sdb, &key_id, classFlags, search, mustStrict, pTemplate, ulCount); } |