Bug 858231: Update NSS to NSS 3.15 Beta 3, with local patches

bug-835919.patch and bug-835919.patch. r=wtc.
Bug 866525: Add AddressSanitizer annotations to port_ArenaZeroAfterMark.
r=choller.

Also include fixes for bug 866363, bug 866949, bug 835919, bug 863871.

security/nss/TAG-INFO

@@ -1 +1 @@
-NSS_3_15_BETA2
+NSS_3_15_BETA3

security/nss/cmd/Makefile

@@ -14,6 +14,14 @@ ifdef BUILD_LIBPKIX_TESTS
 DIRS += libpkix
 endif
 
+ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
+BLTEST_SRCDIR=
+FIPSTEST_SRCDIR=
+else
+BLTEST_SRCDIR      = bltest
+FIPSTEST_SRCDIR    = fipstest
+endif
+
 LOWHASHTEST_SRCDIR=
 ifeq ($(FREEBL_LOWHASH),1)
 LOWHASHTEST_SRCDIR = lowhashtest  # Add the lowhashtest directory to DIRS.

security/nss/cmd/addbuiltin/addbuiltin.c

@@ -4,8 +4,6 @@
 
 /*
  * Tool for converting builtin CA certs.
- *
- * $Id$
  */
 
 #include "nssrenam.h"

security/nss/cmd/crlutil/crlgen_lex.c

@@ -4,10 +4,6 @@
 
 /* A lexical scanner generated by flex */
 
-/* Scanner skeleton version:
- * $Header$
- */
-
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5

security/nss/cmd/lib/pppolicy.c

@@ -4,8 +4,6 @@
 
 /*
  * Support for various policy related extensions
- *
- * $Id$
  */
 
 #include "seccomon.h"

security/nss/cmd/manifest.mn

@@ -11,7 +11,7 @@ REQUIRES = nss nspr libdbm
 DIRS = lib  \
  addbuiltin \
  atob  \
- bltest \
+ $(BLTEST_SRCDIR) \
  btoa  \
  certcgi \
  certutil  \
@@ -23,7 +23,7 @@ DIRS = lib  \
  derdump  \
  digest  \
  httpserv  \
- fipstest  \
+ $(FIPSTEST_SRCDIR)  \
  $(LOWHASHTEST_SRCDIR)  \
  listsuites \
  makepqg  \

security/nss/cmd/modutil/lex.Pk11Install_yy.c

@@ -23,10 +23,6 @@
 #line 20 "lex.Pk11Install_yy.c"
 /* A lexical scanner generated by flex */
 
-/* Scanner skeleton version:
- * $Header$
- */
-
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5

security/nss/cmd/ocspclnt/ocspclnt.c

@@ -4,8 +4,6 @@
 
 /*
  * Test program for client-side OCSP.
- *
- * $Id$
  */
 
 #include "secutil.h"

security/nss/cmd/p7content/p7content.c

@@ -4,8 +4,6 @@
 
 /*
  * p7content -- A command to display pkcs7 content.
- *
- * $Id$
  */
 
 #include "nspr.h"

security/nss/cmd/p7env/p7env.c

@@ -4,8 +4,6 @@
 
 /*
  * p7env -- A command to create a pkcs7 enveloped data.
- *
- * $Id$
  */
 
 #include "nspr.h"

security/nss/cmd/p7sign/p7sign.c

@@ -5,8 +5,6 @@
 /*
  * p7sign -- A command to create a *detached* pkcs7 signature (over a given
  * input file).
- *
- * $Id$
  */
 
 #include "nspr.h"

security/nss/cmd/p7verify/p7verify.c

@@ -4,8 +4,6 @@
 
 /*
  * p7verify -- A command to do a verification of a *detached* pkcs7 signature.
- *
- * $Id$
  */
 
 #include "nspr.h"

security/nss/cmd/platlibs.mk

@@ -36,7 +36,18 @@ ifdef USE_STATIC_LIBS
 
 DEFINES += -DNSS_USE_STATIC_LIBS
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
-CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+ifndef USE_SYSTEM_FREEBL
+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+SOFTOKENLIB=$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX)
+else
+# Use the system freebl and softoken libraries
+CRYPTOLIB=$(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+SOFTOKENLIB=
+EXTRA_SHARED_LIBS += \
+	-L$(SOFTOKEN_LIB_DIR) \
+	-lsoftokn3 \
+	$(NULL)
+endif
 
 PKIXLIB = \
 	$(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
@@ -67,7 +78,7 @@ EXTRA_LIBS += \
 	$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
+	$(SOFTOKENLIB) \
 	$(CRYPTOLIB) \
 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
@@ -102,7 +113,7 @@ EXTRA_LIBS += \
 	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
+	$(SOFTOKENLIB) \
 	$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
@@ -185,8 +196,22 @@ EXTRA_SHARED_LIBS += \
 	$(NULL)
 endif
 
+ifdef SOFTOKEN_LIB_DIR
+ifdef NSS_USE_SYSTEM_FREEBL
+EXTRA_SHARED_LIBS += -L$(SOFTOKEN_LIB_DIR) -lsoftokn3
+endif
+endif
+
 endif # USE_STATIC_LIBS
 
+# If a platform has a system freebl, set USE_SYSTEM_FREEBL to 1 and
+# FREEBL_LIBS to the linker command-line arguments for the system nss-util
+# (for example, -lfreebl3 on fedora) in the platform's config file in coreconf.
+ifdef NSS_USE_SYSTEM_FREEBL
+FREEBL_LIBS = $(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+EXTRA_LIBS += $(FREEBL_LIBS)
+endif
+
 # If a platform has a system zlib, set USE_SYSTEM_ZLIB to 1 and
 # ZLIB_LIBS to the linker command-line arguments for the system zlib
 # (for example, -lz) in the platform's config file in coreconf.

security/nss/cmd/pp/pp.c

@@ -5,8 +5,6 @@
 /*
  * Pretty-print some well-known BER or DER encoded data (e.g. certificates,
  * keys, pkcs7)
- *
- * $Id$
  */
 
 #include "secutil.h"

security/nss/cmd/pwdecrypt/pwdecrypt.c

@@ -4,8 +4,6 @@
 
 /*
  * Test program for SDR (Secret Decoder Ring) functions.
- *
- * $Id$
  */
 
 #include "nspr.h"

security/nss/cmd/sdrtest/sdrtest.c

@@ -4,8 +4,6 @@
 
 /*
  * Test program for SDR (Secret Decoder Ring) functions.
- *
- * $Id$
  */
 
 #include "nspr.h"

security/nss/cmd/shlibsign/Makefile

@@ -45,7 +45,10 @@ endif
 
 
 # sign any and all shared libraries that contain the word freebl
-
+ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
+CHECKLIBS =
+CHECKLOC =
+else
 CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX)
 CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX))
 ifndef NSS_DISABLE_DBM
@@ -55,7 +58,7 @@ CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
 
 MD_LIB_RELEASE_FILES = $(CHECKLOC)
 ALL_TRASH += $(CHECKLOC)
-
+endif
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #

security/nss/cmd/shlibsign/mangle/mangle.c

@@ -4,8 +4,6 @@
 
 /*
  * Test program to mangle 1 bit in a binary
- *
- * $Id$
  */
 
 #include "nspr.h"

security/nss/cmd/shlibsign/shlibsign.c

@@ -13,8 +13,6 @@
  * When in FIPS 140 mode, the NSS Internal FIPS PKCS #11 Module will
  * compute the checksum for the NSS cryptographic boundary libraries
  * and compare the checksum with the value in .chk file.
- *
- * $Id$
  */
 
 #ifdef XP_UNIX

security/nss/cmd/smimetools/cmsutil.c

@@ -4,8 +4,6 @@
 
 /*
  * cmsutil -- A command to work with CMS data
- *
- * $Id$
  */
 
 #include "nspr.h"

security/nss/cmd/smimetools/rules.mk

@@ -2,7 +2,6 @@
 # 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/.
-# $Id$
 
 install::
 	$(INSTALL) -m 755 $(SCRIPTS) $(SOURCE_BIN_DIR)

security/nss/cmd/smimetools/smime

@@ -7,8 +7,6 @@
 #
 # smime.pl - frontend for S/MIME message generation and parsing
 #
-# $Id$
-#
 
 use Getopt::Std;
 

security/nss/cmd/ssltap/ssltap.c

@@ -36,9 +36,6 @@
 #include "ocsp.h"
 #include "ocspti.h"     /* internals for pretty-printing routines *only* */
 
-#define VERSIONSTRING "$Revision$ ($Date$) $Author$"
-
-
 struct _DataBufferList;
 struct _DataBuffer;
 
@@ -1765,7 +1762,7 @@ int main(int argc,  char *argv[])
   SECStatus   rv;
 
   progName = argv[0];
-  optstate = PL_CreateOptState(argc,argv,"fvxhslp:");
+  optstate = PL_CreateOptState(argc,argv,"fxhslp:");
     while ((status = PL_GetNextOpt(optstate)) == PL_OPT_OK) {
     switch (optstate->option) {
     case 'f':
@@ -1774,9 +1771,6 @@ int main(int argc,  char *argv[])
     case 'h':
       hexparse++;
       break;
-    case 'v':
-      PR_fprintf(PR_STDOUT,"Version: %s\n",VERSIONSTRING);
-      break;
     case 's':
       sslparse++;
       break;

security/nss/coreconf/coreconf.dep

@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-

security/nss/lib/Makefile

@@ -62,3 +62,14 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
+ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
+# Not included when building nss without softoken
+UTIL_SRCDIR=
+FREEBL_SRCDIR=
+SOFTOKEN_SRCDIR=
+else
+# default is to include all
+UTIL_SRCDIR = util
+FREEBL_SRCDIR = freebl
+SOFTOKEN_SRCDIR = softoken
+endif

security/nss/lib/base/Makefile

@@ -2,7 +2,6 @@
 # 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/.
-MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk

security/nss/lib/base/arena.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * arena.c
  *

security/nss/lib/base/base.h

@@ -5,10 +5,6 @@
 #ifndef BASE_H
 #define BASE_H
 
-#ifdef DEBUG
-static const char BASE_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * base.h
  *

security/nss/lib/base/baset.h

@@ -5,10 +5,6 @@
 #ifndef BASET_H
 #define BASET_H
 
-#ifdef DEBUG
-static const char BASET_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * baset.h
  *

security/nss/lib/base/config.mk

@@ -2,7 +2,6 @@
 # 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/.
-CONFIG_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 ifdef BUILD_IDG
 DEFINES += -DNSSDEBUG

security/nss/lib/base/error.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * error.c
  *

security/nss/lib/base/errorval.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * errorval.c
  *

security/nss/lib/base/hash.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * hash.c
  *

security/nss/lib/base/hashops.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * hashops.c
  *

security/nss/lib/base/item.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * item.c
  *

security/nss/lib/base/libc.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * libc.c
  *

security/nss/lib/base/list.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * list.c
  *

security/nss/lib/base/manifest.mn

@@ -2,7 +2,6 @@
 # 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/.
-MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 CORE_DEPTH = ../..
 

security/nss/lib/base/nssbase.h

@@ -5,10 +5,6 @@
 #ifndef NSSBASE_H
 #define NSSBASE_H
 
-#ifdef DEBUG
-static const char NSSBASE_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * nssbase.h
  *

security/nss/lib/base/nssbaset.h

@@ -5,10 +5,6 @@
 #ifndef NSSBASET_H
 #define NSSBASET_H
 
-#ifdef DEBUG
-static const char NSSBASET_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * nssbaset.h
  *

security/nss/lib/base/tracker.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * tracker.c
  * 

security/nss/lib/base/utf8.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * utf8.c
  *

security/nss/lib/certdb/cert.h

@@ -4,8 +4,6 @@
 
 /*
  * cert.h - public data structures and prototypes for the certificate library
- *
- * $Id$
  */
 
 #ifndef _CERT_H_

security/nss/lib/certdb/certdb.c

@@ -4,8 +4,6 @@
 
 /*
  * Certificate handling code
- *
- * $Id$
  */
 
 #include "nssilock.h"

security/nss/lib/certdb/certi.h

@@ -3,8 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * certi.h - private data structures for the certificate library
- *
- * $Id$
  */
 #ifndef _CERTI_H_
 #define _CERTI_H_

security/nss/lib/certdb/certt.h

@@ -3,8 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * certt.h - public data structures for the certificate library
- *
- * $Id$
  */
 #ifndef _CERTT_H_
 #define _CERTT_H_

security/nss/lib/certdb/certv3.c

@@ -4,8 +4,6 @@
 
 /*
  * Code for dealing with X509.V3 extensions.
- *
- * $Id$
  */
 
 #include "cert.h"

security/nss/lib/certdb/crl.c

@@ -4,8 +4,6 @@
 
 /*
  * Moved from secpkcs7.c
- *
- * $Id$
  */
  
 #include "cert.h"

security/nss/lib/certdb/polcyxtn.c

@@ -4,8 +4,6 @@
 
 /*
  * Support for various policy related extensions
- *
- * $Id$
  */
 
 #include "seccomon.h"

security/nss/lib/certhigh/certhtml.c

@@ -4,8 +4,6 @@
 
 /*
  * certhtml.c --- convert a cert to html
- *
- * $Id$
  */
 
 #include "seccomon.h"

security/nss/lib/certhigh/crlv2.c

@@ -4,8 +4,6 @@
 
 /*
  * Code for dealing with x.509 v3 crl and crl entries extensions.
- *
- * $Id$
  */
 
 #include "cert.h"

security/nss/lib/certhigh/ocsp.c

@@ -5,8 +5,6 @@
 /*
  * Implementation of OCSP services, for both client and server.
  * (XXX, really, mostly just for client right now, but intended to do both.)
- *
- * $Id$
  */
 
 #include "prerror.h"

security/nss/lib/certhigh/ocsp.h

@@ -4,8 +4,6 @@
 
 /*
  * Interface to the OCSP implementation.
- *
- * $Id$
  */
 
 #ifndef _OCSP_H_

security/nss/lib/certhigh/ocspi.h

@@ -3,8 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * ocspi.h - NSS internal interfaces to OCSP code
- *
- * $Id$
  */
 
 #ifndef _OCSPI_H_

security/nss/lib/certhigh/ocspt.h

@@ -4,8 +4,6 @@
 
 /*
  * Public header for exported OCSP types.
- *
- * $Id$
  */
 
 #ifndef _OCSPT_H_

security/nss/lib/certhigh/ocspti.h

@@ -4,8 +4,6 @@
 
 /*
  * Private header defining OCSP types.
- *
- * $Id$
  */
 
 #ifndef _OCSPTI_H_

security/nss/lib/ckfw/Makefile

@@ -2,7 +2,6 @@
 # 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/.
-MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk

security/nss/lib/ckfw/builtins/Makefile

@@ -2,7 +2,6 @@
 # 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/.
-MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
@@ -51,4 +50,5 @@ NSS_CERTDATA_TXT = certdata.txt
 endif
 
 $(OBJDIR)/certdata.c: $(NSS_CERTDATA_TXT) certdata.perl
+	@$(MAKE_OBJDIR)
 	$(PERL) certdata.perl < $(NSS_CERTDATA_TXT) > $@

security/nss/lib/ckfw/builtins/anchor.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * builtins/anchor.c
  *

security/nss/lib/ckfw/builtins/bfind.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #ifndef BUILTINS_H
 #include "builtins.h"
 #endif /* BUILTINS_H */

security/nss/lib/ckfw/builtins/binst.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "builtins.h"
 
 /*

security/nss/lib/ckfw/builtins/bobject.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "builtins.h"
 
 /*

security/nss/lib/ckfw/builtins/bsession.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "builtins.h"
 
 /*

security/nss/lib/ckfw/builtins/bslot.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "builtins.h"
 
 /*

security/nss/lib/ckfw/builtins/btoken.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "builtins.h"
 
 /*

security/nss/lib/ckfw/builtins/builtins.h

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char BUILTINS_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "nssckmdt.h"
 #include "nssckfw.h"
 

security/nss/lib/ckfw/builtins/config.mk

@@ -2,7 +2,6 @@
 # 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/.
-CONFIG_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 #
 #  Override TARGETS variable so that only shared libraries

security/nss/lib/ckfw/builtins/constants.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * builtins/constants.c
  *

security/nss/lib/ckfw/builtins/manifest.mn

@@ -2,7 +2,6 @@
 # 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/.
-MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 CORE_DEPTH = ../../..
 

security/nss/lib/ckfw/capi/Makefile

@@ -2,7 +2,6 @@
 # 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/.
-MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk

security/nss/lib/ckfw/capi/anchor.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * capi/canchor.c
  *

security/nss/lib/ckfw/capi/cfind.c

@@ -1,9 +1,6 @@
 /* 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/. */
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
 
 #ifndef CKCAPI_H
 #include "ckcapi.h"

security/nss/lib/ckfw/capi/cinst.c

@@ -1,9 +1,6 @@
 /* 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/. */
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
 
 #include "ckcapi.h"
 

security/nss/lib/ckfw/capi/ckcapi.h

@@ -5,10 +5,6 @@
 #ifndef CKCAPI_H
 #define CKCAPI_H 1
 
-#ifdef DEBUG
-static const char CKCAPI_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "nssckmdt.h"
 #include "nssckfw.h"
 

security/nss/lib/ckfw/capi/cobject.c

@@ -1,9 +1,6 @@
 /* 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/. */
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
 
 #include "ckcapi.h"
 #include "nssbase.h"

security/nss/lib/ckfw/capi/config.mk

@@ -2,7 +2,6 @@
 # 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/.
-CONFIG_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 #
 #  Override TARGETS variable so that only shared libraries

security/nss/lib/ckfw/capi/constants.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * ckcapi/constants.c
  *

security/nss/lib/ckfw/capi/crsa.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "ckcapi.h"
 #include "secdert.h"
 

security/nss/lib/ckfw/capi/csession.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "ckcapi.h"
 
 /*

security/nss/lib/ckfw/capi/cslot.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "ckcapi.h"
 
 /*

security/nss/lib/ckfw/capi/ctoken.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "ckcapi.h"
 
 /*

security/nss/lib/ckfw/capi/manifest.mn

@@ -2,7 +2,6 @@
 # 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/.
-MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 CORE_DEPTH = ../../../..
 

security/nss/lib/ckfw/capi/staticobj.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$""; @(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #ifndef CKCAPI_H
 #include "ckcapi.h"
 #endif /* CKCAPI_H */

security/nss/lib/ckfw/ck.h

@@ -5,10 +5,6 @@
 #ifndef CK_H
 #define CK_H
 
-#ifdef DEBUG
-static const char CK_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * ck.h
  *

security/nss/lib/ckfw/ckapi.perl

@@ -3,7 +3,6 @@
 # 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/.
-$cvs_id = '@(#) $RCSfile$ $Revision$ $Date$';
 
 $copyright = '/* THIS IS A GENERATED FILE */
 /* This Source Code Form is subject to the terms of the Mozilla Public

security/nss/lib/ckfw/ckfw.h

@@ -5,10 +5,6 @@
 #ifndef CKFW_H
 #define CKFW_H
 
-#ifdef DEBUG
-static const char CKFW_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * ckfw.h
  *

security/nss/lib/ckfw/ckfwm.h

@@ -5,10 +5,6 @@
 #ifndef CKFWM_H
 #define CKFWM_H
 
-#ifdef DEBUG
-static const char CKFWM_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * ckfwm.h
  *

security/nss/lib/ckfw/ckfwtm.h

@@ -5,10 +5,6 @@
 #ifndef CKFWTM_H
 #define CKFWTM_H
 
-#ifdef DEBUG
-static const char CKFWTM_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * ckfwtm.h
  *

security/nss/lib/ckfw/ckmd.h

@@ -5,10 +5,6 @@
 #ifndef CKMD_H
 #define CKMD_H
 
-#ifdef DEBUG
-static const char CKMD_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * ckmd.h
  *

security/nss/lib/ckfw/config.mk

@@ -2,7 +2,6 @@
 # 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/.
-CONFIG_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 ifdef BUILD_IDG
 DEFINES += -DNSSDEBUG

security/nss/lib/ckfw/crypto.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * crypto.c
  *

security/nss/lib/ckfw/dbm/Makefile

@@ -2,7 +2,6 @@
 # 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/.
-MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 include manifest.mn
 include config.mk

security/nss/lib/ckfw/dbm/anchor.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 /*
  * dbm/anchor.c
  *

security/nss/lib/ckfw/dbm/ckdbm.h

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CKDBM_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #ifndef CKDBM_H
 #define CKDBM_H
 

security/nss/lib/ckfw/dbm/config.mk

@@ -2,7 +2,6 @@
 # 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/.
-CONFIG_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 ifdef BUILD_IDG
 DEFINES += -DNSSDEBUG

security/nss/lib/ckfw/dbm/db.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "ckdbm.h"
 
 #define PREFIX_METADATA "0000"

security/nss/lib/ckfw/dbm/find.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "ckdbm.h"
 
 static void

security/nss/lib/ckfw/dbm/instance.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "ckdbm.h"
 
 static CK_RV

security/nss/lib/ckfw/dbm/manifest.mn

@@ -2,7 +2,6 @@
 # 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/.
-MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
 CORE_DEPTH = ../../../..
 

security/nss/lib/ckfw/dbm/object.c

@@ -2,10 +2,6 @@
  * 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/. */
 
-#ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
-#endif /* DEBUG */
-
 #include "ckdbm.h"
 
 static void