NSS: update to 3.12.6 RC0

mozilla/security/nss/lib/nss/nss.h

 /*
  * NSS utility functions
  *
  * ***** 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/
@@ skipping 18 matching lines @@
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * 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 ***** */
-/* $Id: nss.h,v 1.74 2009/11/20 20:15:05 christophe.ravel.bugs%sun.com Exp $ */
+/* $Id: nss.h,v 1.76 2010/02/11 19:12:45 christophe.ravel.bugs%sun.com Exp $ */
 
 #ifndef __nss_h_
 #define __nss_h_
 
 /* The private macro _NSS_ECC_STRING is for NSS internal use only. */
 #ifdef NSS_ENABLE_ECC
 #ifdef NSS_ECC_MORE_THAN_SUITE_B
 #define _NSS_ECC_STRING " Extended ECC"
 #else
 #define _NSS_ECC_STRING " Basic ECC"
 #endif
 #else
 #define _NSS_ECC_STRING ""
 #endif
 
 /* The private macro _NSS_CUSTOMIZED is for NSS internal use only. */
 #if defined(NSS_ALLOW_UNSUPPORTED_CRITICAL)
 #define _NSS_CUSTOMIZED " (Customized build)"
 #else
 #define _NSS_CUSTOMIZED 
 #endif
 
 /*
  * NSS's major version, minor version, patch level, build number, and whether
  * this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.12.6.0" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION  "3.12.6.0" _NSS_ECC_STRING _NSS_CUSTOMIZED
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   12
 #define NSS_VPATCH   6
 #define NSS_VBUILD   0
-#define NSS_BETA     PR_TRUE
+#define NSS_BETA     PR_FALSE
 
 #ifndef RC_INVOKED
 
 #include "seccomon.h"
 
 typedef struct NSSInitParametersStr NSSInitParameters;
 
 /*
  * parameters used to initialize softoken. Mostly strings used to 
  * internationalize softoken. Memory for the strings are owned by the caller,
@@ skipping 171 matching lines @@
 #define NSS_INIT_PK11THREADSAFE   0x40
 #define NSS_INIT_PK11RELOAD       0x80
 #define NSS_INIT_NOPK11FINALIZE   0x100
 #define NSS_INIT_RESERVED         0x200
 
 #define NSS_INIT_COOPERATE NSS_INIT_PK11THREADSAFE | \
         NSS_INIT_PK11RELOAD | \
         NSS_INIT_NOPK11FINALIZE | \
         NSS_INIT_RESERVED
 
-#ifdef macintosh
-#define SECMOD_DB "Security Modules"
-#else
 #define SECMOD_DB "secmod.db"
-#endif
 
 typedef struct NSSInitContextStr NSSInitContext;
 
 
 extern SECStatus NSS_Initialize(const char *configdir, 
         const char *certPrefix, const char *keyPrefix, 
         const char *secmodName, PRUint32 flags);
 
 extern NSSInitContext *NSS_InitContext(const char *configdir, 
         const char *certPrefix, const char *keyPrefix, 
@@ skipping 62 matching lines @@
 /*
  * Dump the contents of the certificate cache and the temporary cert store.
  * Use to detect leaked references of certs at shutdown time.
  */
 void nss_DumpCertificateCacheInfo(void);
 
 SEC_END_PROTOS
 
 #endif /* RC_INVOKED */
 #endif /* __nss_h_ */