diff options
| author | relyea%netscape.com <devnull@localhost> | 2002-01-31 00:16:29 +0000 |
|---|---|---|
| committer | relyea%netscape.com <devnull@localhost> | 2002-01-31 00:16:29 +0000 |
| commit | ea9321198fe6579f13d0719fa546e6bb1d760467 (patch) | |
| tree | 5d9790636fa9712765557127a1e375472c266bca | |
| parent | e099c6e78e970c04eff718cf12bb8598da3570fa (diff) | |
| download | nss-hg-ea9321198fe6579f13d0719fa546e6bb1d760467.tar.gz | |
Fix searching code so it can find CRL's
| -rw-r--r-- | security/nss/lib/softoken/pcertdb.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/softoken/pkcs11.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/lib/softoken/pcertdb.c b/security/nss/lib/softoken/pcertdb.c index 166078934..b392d36a3 100644 --- a/security/nss/lib/softoken/pcertdb.c +++ b/security/nss/lib/softoken/pcertdb.c @@ -4343,7 +4343,7 @@ nsslowcert_FindCrlByKey(NSSLOWCERTCertDBHandle *handle, SECItem *crlKey, goto loser; } - if (entry->url) { + if (url && entry->url) { *url = PORT_Strdup(entry->url); } crl = SECITEM_DupItem(&entry->derCrl); diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c index 06d45ad0f..10585e447 100644 --- a/security/nss/lib/softoken/pkcs11.c +++ b/security/nss/lib/softoken/pkcs11.c @@ -3676,7 +3676,7 @@ pk11_searchTokenList(PK11Slot *slot, PK11SearchResults *search, }; SECItem *copy = NULL; unsigned long classFlags = - NSC_CERT|NSC_TRUST|NSC_PRIVATE|NSC_PUBLIC|NSC_KEY|NSC_SMIME; + NSC_CERT|NSC_TRUST|NSC_PRIVATE|NSC_PUBLIC|NSC_KEY|NSC_SMIME|NSC_CRL; /* if we aren't logged in, don't look for private or secret keys */ if (!isLoggedIn) { @@ -3695,11 +3695,11 @@ pk11_searchTokenList(PK11Slot *slot, PK11SearchResults *search, switch (pTemplate[i].type) { case CKA_SUBJECT: copy = &derSubject; - classFlags &= (NSC_CERT|NSC_PRIVATE|NSC_PUBLIC|NSC_SMIME); + classFlags &= (NSC_CERT|NSC_PRIVATE|NSC_PUBLIC|NSC_SMIME|NSC_CRL); break; case CKA_ISSUER: copy = &issuerSN.derIssuer; - classFlags &= (NSC_CERT|NSC_CRL|NSC_TRUST); + classFlags &= (NSC_CERT|NSC_TRUST); break; case CKA_SERIAL_NUMBER: copy = &issuerSN.serialNumber; |