Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/pki/certificate.c

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 17 matching lines @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: certificate.c,v $ $Revision: 1.66 $ $Date: 2009/02/09 07:51:27 $";
+static const char CVS_ID[] = "@(#) $RCSfile: certificate.c,v $ $Revision: 1.67 $ $Date: 2010/04/03 18:27:32 $";
 #endif /* DEBUG */
 
 #ifndef NSSPKI_H
 #include "nsspki.h"
 #endif /* NSSPKI_H */
 
 #ifndef PKIT_H
 #include "pkit.h"
 #endif /* PKIT_H */
 
@@ skipping 87 matching lines @@
         NSSCryptoContext *cc = c->object.cryptoContext;
 
         PR_ASSERT(c->object.refCount > 0);
 
         /* --- LOCK storage --- */
         if (cc) {
             nssCertificateStore_Lock(cc->certStore, &lockTrace);
         } else {
             nssTrustDomain_LockCertCache(td);
         }
-        if (PR_AtomicDecrement(&c->object.refCount) == 0) {
+        if (PR_ATOMIC_DECREMENT(&c->object.refCount) == 0) {
             /* --- remove cert and UNLOCK storage --- */
             if (cc) {
                 nssCertificateStore_RemoveCertLOCKED(cc->certStore, c);
                 nssCertificateStore_Unlock(cc->certStore, &lockTrace,
                                            &unlockTrace);
             } else {
                 nssTrustDomain_RemoveCertFromCacheLOCKED(td, c);
                 nssTrustDomain_UnlockCertCache(td);
             }
             /* free cert data */
@@ skipping 991 matching lines @@
 nssCRL_GetEncoding (
   NSSCRL *crl
 )
 {
     if (crl && crl->encoding.data != NULL && crl->encoding.size > 0) {
         return &crl->encoding;
     } else {
         return (NSSDER *)NULL;
     }
 }