Bug 1169174, Remove __DATE__ and __TIME__ references from NSS, r=rrelyea

16 files changed, 37 insertions, 106 deletions

diff --git a/lib/ckfw/builtins/binst.c b/lib/ckfw/builtins/binst.c
index a837113bb..8940ea035 100644
--- a/lib/ckfw/builtins/binst.c
+++ b/lib/ckfw/builtins/binst.c
@@ -65,11 +65,10 @@ builtins_mdInstance_GetLibraryVersion
   NSSCKFWInstance *fwInstance
 )
 {
-  extern const char __nss_builtins_rcsid[];
-  extern const char __nss_builtins_sccsid[];
+  extern const char __nss_builtins_version[];
   volatile char c; /* force a reference that won't get optimized away */
 
-  c = __nss_builtins_rcsid[0] + __nss_builtins_sccsid[0];
+  c = __nss_builtins_version[0];
   return nss_builtins_LibraryVersion;
 }
 
diff --git a/lib/ckfw/builtins/ckbiver.c b/lib/ckfw/builtins/ckbiver.c
index c8ea7a9c3..41783b2fb 100644
--- a/lib/ckfw/builtins/ckbiver.c
+++ b/lib/ckfw/builtins/ckbiver.c
@@ -13,14 +13,7 @@
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_builtins_rcsid[] = "$Header: NSS Builtin Trusted Root CAs "
-        NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_builtins_sccsid[] = "@(#)NSS Builtin Trusted Root CAs "
-        NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_builtins_version[] = "Version: NSS Builtin Trusted Root CAs "
+        NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING;
diff --git a/lib/ckfw/capi/ckcapiver.c b/lib/ckfw/capi/ckcapiver.c
index cddf6c46a..54e488756 100644
--- a/lib/ckfw/capi/ckcapiver.c
+++ b/lib/ckfw/capi/ckcapiver.c
@@ -12,14 +12,7 @@
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_ckcapi_rcsid[] = "$Header: NSS Access to Microsoft Certificate Store "
-        NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_ckcapi_sccsid[] = "@(#)NSS Access to Microsoft Certificate Store "
-        NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_ckcapi_version[] = "Version: NSS Access to Microsoft Certificate Store "
+        NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING;
diff --git a/lib/ckfw/nssmkey/ckmkver.c b/lib/ckfw/nssmkey/ckmkver.c
index e30fd9875..0f6897634 100644
--- a/lib/ckfw/nssmkey/ckmkver.c
+++ b/lib/ckfw/nssmkey/ckmkver.c
@@ -12,14 +12,7 @@
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_ckmk_rcsid[] = "$Header: NSS Access to the MAC OS X Key Ring "
-        NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_ckmk_sccsid[] = "@(#)NSS Access to the MAC OS X Key Ring "
-        NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_ckmk_version[] = "Version: NSS Access to the MAC OS X Key Ring "
+        NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING;
diff --git a/lib/freebl/freeblver.c b/lib/freebl/freeblver.c
index c288b41ad..9136f0b0b 100644
--- a/lib/freebl/freeblver.c
+++ b/lib/freebl/freeblver.c
@@ -13,12 +13,6 @@
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_freebl_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_freebl_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_freebl_version[] = "Version: NSS " SOFTOKEN_VERSION _DEBUG_STRING;
diff --git a/lib/freebl/ldvector.c b/lib/freebl/ldvector.c
index deb6770f6..c6ace1876 100644
--- a/lib/freebl/ldvector.c
+++ b/lib/freebl/ldvector.c
@@ -294,13 +294,12 @@ static const struct FREEBLVectorStr vector =
 const FREEBLVector *
 FREEBL_GetVector(void)
 {
-    extern const char __nss_freebl_rcsid[];
-    extern const char __nss_freebl_sccsid[];
+    extern const char __nss_freebl_version[];
 
     /* force a reference that won't get optimized away */
     volatile char c;
 
-    c = __nss_freebl_rcsid[0] + __nss_freebl_sccsid[0];
+    c = __nss_freebl_version[0];
 #ifdef FREEBL_NO_DEPEND
     FREEBL_InitStubs();
 #endif
diff --git a/lib/nss/nssinit.c b/lib/nss/nssinit.c
index 6218a7e93..3966c35e2 100644
--- a/lib/nss/nssinit.c
+++ b/lib/nss/nssinit.c
@@ -1230,8 +1230,7 @@ NSS_IsInitialized(void)
 }
 	
 
-extern const char __nss_base_rcsid[];
-extern const char __nss_base_sccsid[];
+extern const char __nss_base_version[];
 
 PRBool
 NSS_VersionCheck(const char *importedVersion)
@@ -1249,7 +1248,7 @@ NSS_VersionCheck(const char *importedVersion)
     const char *ptr = importedVersion;
     volatile char c; /* force a reference that won't get optimized away */
 
-    c = __nss_base_rcsid[0] + __nss_base_sccsid[0]; 
+    c = __nss_base_version[0];
 
     while (isdigit(*ptr)) {
         vmajor = 10 * vmajor + *ptr - '0';
diff --git a/lib/nss/nssver.c b/lib/nss/nssver.c
index e2aa0cec5..653ebec68 100644
--- a/lib/nss/nssver.c
+++ b/lib/nss/nssver.c
@@ -13,12 +13,6 @@
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_base_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_base_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_base_version[] = "Version: NSS " NSS_VERSION _DEBUG_STRING;
diff --git a/lib/smime/smimeutil.c b/lib/smime/smimeutil.c
index 90fa0cf2d..fbb61b9c1 100644
--- a/lib/smime/smimeutil.c
+++ b/lib/smime/smimeutil.c
@@ -754,8 +754,7 @@ loser:
     return cert;
 }
 
-extern const char __nss_smime_rcsid[];
-extern const char __nss_smime_sccsid[];
+extern const char __nss_smime_version[];
 
 PRBool
 NSSSMIME_VersionCheck(const char *importedVersion)
@@ -771,7 +770,7 @@ NSSSMIME_VersionCheck(const char *importedVersion)
      */
     volatile char c; /* force a reference that won't get optimized away */
 
-    c = __nss_smime_rcsid[0] + __nss_smime_sccsid[0]; 
+    c = __nss_smime_version[0];
 
     return NSS_VersionCheck(importedVersion);
 }
diff --git a/lib/smime/smimever.c b/lib/smime/smimever.c
index 917bbf59d..8c06130ab 100644
--- a/lib/smime/smimever.c
+++ b/lib/smime/smimever.c
@@ -13,12 +13,6 @@
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_smime_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_smime_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_smime_version[] = "Version: NSS " NSS_VERSION _DEBUG_STRING;
diff --git a/lib/softoken/legacydb/lginit.c b/lib/softoken/legacydb/lginit.c
index 37efcd6fb..d08d4506a 100644
--- a/lib/softoken/legacydb/lginit.c
+++ b/lib/softoken/legacydb/lginit.c
@@ -22,15 +22,9 @@
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_dbm_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_dbm_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_dbm_version[] = "Version: NSS " SOFTOKEN_VERSION _DEBUG_STRING;
 
 typedef struct LGPrivateStr {
     NSSLOWCERTCertDBHandle *certDB;
@@ -595,7 +589,7 @@ legacy_Open(const char *configdir, const char *certPrefix,
     PRBool readOnly = (flags == SDB_RDONLY)? PR_TRUE: PR_FALSE;
     volatile char c; /* force a reference that won't get optimized away */
 
-    c = __nss_dbm_rcsid[0] + __nss_dbm_sccsid[0];
+    c = __nss_dbm_version[0];
 
     rv = SECOID_Init();
     if (SECSuccess != rv) {
diff --git a/lib/softoken/pkcs11.c b/lib/softoken/pkcs11.c
index bd7c4bd5f..123e6f977 100644
--- a/lib/softoken/pkcs11.c
+++ b/lib/softoken/pkcs11.c
@@ -3135,8 +3135,7 @@ CK_RV NSC_Finalize (CK_VOID_PTR pReserved)
     return crv;
 }
 
-extern const char __nss_softokn_rcsid[];
-extern const char __nss_softokn_sccsid[];
+extern const char __nss_softokn_version[];
 
 /* NSC_GetInfo returns general information about Cryptoki. */
 CK_RV  NSC_GetInfo(CK_INFO_PTR pInfo)
@@ -3145,7 +3144,7 @@ CK_RV  NSC_GetInfo(CK_INFO_PTR pInfo)
 
     CHECK_FORK();
     
-    c = __nss_softokn_rcsid[0] + __nss_softokn_sccsid[0]; 
+    c = __nss_softokn_version[0];
     pInfo->cryptokiVersion.major = 2;
     pInfo->cryptokiVersion.minor = 20;
     PORT_Memcpy(pInfo->manufacturerID,manufacturerID,32);
diff --git a/lib/softoken/softkver.c b/lib/softoken/softkver.c
index de21bfef3..3f20fad27 100644
--- a/lib/softoken/softkver.c
+++ b/lib/softoken/softkver.c
@@ -13,12 +13,6 @@
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_softokn_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_softokn_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_softokn_version[] = "Version: NSS " SOFTOKEN_VERSION _DEBUG_STRING;
diff --git a/lib/ssl/sslcon.c b/lib/ssl/sslcon.c
index 8c5a5ad3d..24e4d673f 100644
--- a/lib/ssl/sslcon.c
+++ b/lib/ssl/sslcon.c
@@ -3669,8 +3669,7 @@ loser:
 */
 
 #include "nss.h"
-extern const char __nss_ssl_rcsid[];
-extern const char __nss_ssl_sccsid[];
+extern const char __nss_ssl_version[];
 
 PRBool
 NSSSSL_VersionCheck(const char *importedVersion)
@@ -3686,7 +3685,7 @@ NSSSSL_VersionCheck(const char *importedVersion)
      */
     volatile char c; /* force a reference that won't get optimized away */
 
-    c = __nss_ssl_rcsid[0] + __nss_ssl_sccsid[0]; 
+    c = __nss_ssl_version[0];
     return NSS_VersionCheck(importedVersion);
 }
 
diff --git a/lib/ssl/sslver.c b/lib/ssl/sslver.c
index 35e0317ea..666e25922 100644
--- a/lib/ssl/sslver.c
+++ b/lib/ssl/sslver.c
@@ -13,12 +13,6 @@
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_ssl_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_ssl_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_ssl_version[] = "Version: NSS " NSS_VERSION _DEBUG_STRING;
diff --git a/lib/util/secoid.c b/lib/util/secoid.c
index 5b1714a32..a8ef5ec1f 100644
--- a/lib/util/secoid.c
+++ b/lib/util/secoid.c
@@ -20,15 +20,9 @@
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_util_rcsid[] = "$Header: NSS " NSSUTIL_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_util_sccsid[] = "@(#)NSS " NSSUTIL_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_util_version[] = "Version: NSS " NSSUTIL_VERSION _DEBUG_STRING;
 
 /* MISSI Mosaic Object ID space */
 /* USGov algorithm OID space: { 2 16 840 1 101 } */
@@ -1921,7 +1915,7 @@ SECOID_Init(void)
     char * envVal;
     volatile char c; /* force a reference that won't get optimized away */
 
-    c = __nss_util_rcsid[0] + __nss_util_sccsid[0];
+    c = __nss_util_version[0];
 
     if (oidhash) {
 	return SECSuccess; /* already initialized */