get/set cert trust through PKCS#11; traversal methods for CERT_ calls; define usage for 3.4

1 files changed, 15 insertions, 7 deletions

diff --git a/security/nss/lib/pki/pkim.h b/security/nss/lib/pki/pkim.h
index 66e8bc0e6..2ede9ae22 100644
--- a/security/nss/lib/pki/pkim.h
+++ b/security/nss/lib/pki/pkim.h
@@ -195,20 +195,28 @@ nssTrustDomain_GetCertForIssuerAndSNFromCache
  * Look for a specific cert in the cache.
  */
 NSS_EXTERN NSSCertificate *
-nssTrustDomain_GetCertForIdentifierFromCache
+nssTrustDomain_GetCertByDERFromCache
 (
   NSSTrustDomain *td,
-  NSSItem *id
+  NSSDER *der
 );
 
-/*
- * Look for a specific cert in the cache.
+/* Get all certs from the cache */
+/* XXX this is being included to make some old-style calls word, not to
+ *     say we should keep it
  */
-NSS_EXTERN NSSCertificate *
-nssTrustDomain_GetCertByDERFromCache
+NSS_EXTERN NSSCertificate **
+nssTrustDomain_GetCertsFromCache
 (
   NSSTrustDomain *td,
-  NSSDER *der
+  nssList *certListOpt
+);
+
+NSS_EXTERN PRStatus
+nssCertificate_SetCertTrust
+(
+  NSSCertificate *c,
+  NSSTrust *trust
 );
 
 NSS_EXTERN nssDecodedCert *