Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/certdb/certt.h

 /* ***** 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 18 matching lines @@
  * 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 ***** */
 /*
  * certt.h - public data structures for the certificate library
  *
- * $Id: certt.h,v 1.52 2009/05/29 18:10:38 alexei.volkov.bugs%sun.com Exp $
+ * $Id: certt.h,v 1.54 2010/06/18 00:34:22 wtc%google.com Exp $
  */
 #ifndef _CERTT_H_
 #define _CERTT_H_
 
 #include "prclist.h"
 #include "pkcs11t.h"
 #include "seccomon.h"
 #include "secmodt.h"
 #include "secoidt.h"
 #include "plarena.h"
@@ skipping 196 matching lines @@
     SECItem subjectID;
     CERTCertExtension **extensions;
     char *emailAddr;
     CERTCertDBHandle *dbhandle;
     SECItem subjectKeyID;       /* x509v3 subject key identifier */
     PRBool keyIDGenerated;      /* was the keyid generated? */
     unsigned int keyUsage;      /* what uses are allowed for this cert */
     unsigned int rawKeyUsage;   /* value of the key usage extension */
     PRBool keyUsagePresent;     /* was the key usage extension present */
     PRUint32 nsCertType;        /* value of the ns cert type extension */
-                                /* must be 32-bit for PR_AtomicSet */
+                                /* must be 32-bit for PR_ATOMIC_SET */
 
     /* these values can be set by the application to bypass certain checks
      * or to keep the cert in memory for an entire session.
      * XXX - need an api to set these
      */
     PRBool keepSession;                 /* keep this cert for entire session*/
     PRBool timeOK;                      /* is the bad validity time ok? */
     CERTOKDomainName *domainOK;         /* these domain names are ok */
 
     /*
@@ skipping 637 matching lines @@
                                  * Specified in value.pointer.p. If the 
                                  * operation succeeds the context will be 
                                  * freed. */
    cert_pi_certList        = 3, /* specify the chain to validate against. If
                                  * this value is given, then the path 
                                  * construction step in the validation is 
                                  * skipped. Specified in value.pointer.chain */
    cert_pi_policyOID       = 4, /* validate certificate for policy OID.
                                  * Specified in value.array.oids. Cert must
                                  * be good for at least one OID in order
-                                 * to validate. Default is no policyOID */
+                                 * to validate. Default is that the user is not
+                                 * concerned about certificate policy. */
    cert_pi_policyFlags     = 5, /* flags for each policy specified in policyOID.
                                  * Specified in value.scalar.ul. Policy flags
                                  * apply to all specified oids. 
                                  * Use CERT_POLICY_FLAG_* macros below. If not
                                  * specified policy flags default to 0 */
    cert_pi_keyusage        = 6, /* specify what the keyusages the certificate 
                                  * will be evaluated against, specified in
                                  * value.scalar.ui. The cert must validate for
                                  * at least one of the specified key usages.
                                  * Values match the KU_  bit flags defined
@@ skipping 386 matching lines @@
 SEC_ASN1_CHOOSER_DECLARE(CERT_SetOfSignedCrlTemplate)
 SEC_ASN1_CHOOSER_DECLARE(CERT_SignedDataTemplate)
 SEC_ASN1_CHOOSER_DECLARE(CERT_SubjectPublicKeyInfoTemplate)
 SEC_ASN1_CHOOSER_DECLARE(SEC_SignedCertificateTemplate)
 SEC_ASN1_CHOOSER_DECLARE(CERT_SignedCrlTemplate)
 SEC_ASN1_CHOOSER_DECLARE(CERT_TimeChoiceTemplate)
 
 SEC_END_PROTOS
 
 #endif /* _CERTT_H_ */