Uprev NSS to 3.18 RTM

nss/lib/certdb/certi.h

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * certi.h - private data structures for the certificate library
  */
 #ifndef _CERTI_H_
 #define _CERTI_H_
 
 #include "certt.h"
@@ skipping 98 matching lines @@
     This is a cache of CRL entries for a given distribution point of an issuer
     It is built from a collection of one full and 0 or more delta CRLs.
 */
 
 struct CRLDPCacheStr {
 #ifdef DPC_RWLOCK
     NSSRWLock* lock;
 #else
     PRLock* lock;
 #endif
-    CERTCertificate* issuer;    /* issuer cert
-                                   XXX there may be multiple issuer certs,
-                                       with different validity dates. Also
-                                       need to deal with SKID/AKID . See
-                                       bugzilla 217387, 233118 */
+    SECItem *issuerDERCert;    /* issuer DER cert. Don't hold a reference
+                                  to the actual cert so the trust can be
+                                  updated on the cert automatically.
+                                  XXX there may be multiple issuer certs,
+                                  with different validity dates. Also
+                                  need to deal with SKID/AKID . See
+                                  bugzilla 217387, 233118 */
+
+    CERTCertDBHandle *dbHandle;
+
     SECItem* subject;           /* DER of issuer subject */
     SECItem* distributionPoint; /* DER of distribution point. This may be
                                    NULL when distribution points aren't
                                    in use (ie. the CA has a single CRL).
                                    Currently not used. */
 
     /* array of full CRLs matching this distribution point */
     PRUint32 ncrls;              /* total number of CRLs in crls */
     CachedCrl** crls;            /* array of all matching CRLs */
     /* XCRL With iCRLs and multiple DPs, the CRL can be shared accross several
@@ skipping 24 matching lines @@
 /*  CRL issuer cache object
     This object tracks all the distribution point caches for a given issuer.
     XCRL once we support multiple issuing distribution points, this object
     will be a hash table. For now, it just holds the single CRL distribution
     point cache structure.
 */
 
 struct CRLIssuerCacheStr {
     SECItem* subject;           /* DER of issuer subject */
     CRLDPCache* dpp;
-#if 0
-    /* XCRL for future use.
-       We don't need to lock at the moment because we only have one DP,
-       which gets created at the same time as this object */
-    NSSRWLock* lock;
-    CRLDPCache** dps;
-    PLHashTable* distributionpoints;
-    CERTCertificate* issuer;
-#endif
 };
 
 /*  CRL revocation cache object
     This object tracks all the issuer caches
 */
 
 struct CRLCacheStr {
 #ifdef GLOBAL_RWLOCK
     NSSRWLock* lock;
 #else
@@ skipping 207 matching lines @@
  * particular usage.
  */
 SECStatus
 cert_CheckLeafTrust(CERTCertificate *cert,
                     SECCertUsage usage, 
                     unsigned int *failedFlags,
                     PRBool *isTrusted);
 
 #endif /* _CERTI_H_ */