Fix searching code so it can find CRL's

security/nss/lib/softoken/pcertdb.c

@@ -34,7 +34,7 @@
 /*
  * Permanent Certificate database handling code 
  *
- * $Id: pcertdb.c,v 1.12 2002/01/24 21:33:51 relyea%netscape.com Exp $
+ * $Id: pcertdb.c,v 1.13 2002/01/31 00:16:29 relyea%netscape.com Exp $
  */
 #include "prtime.h"
 
@@ -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);

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;