Put version number in an external header so applications can check if they

are using an up-to-date builtins module.

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

@@ -32,7 +32,7 @@
  */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: constants.c,v $ $Revision: 1.6 $ $Date: 2002-08-27 23:32:31 $ $Name:  $";
+static const char CVS_ID[] = "@(#) $RCSfile: constants.c,v $ $Revision: 1.7 $ $Date: 2002-08-28 22:12:57 $ $Name:  $";
 #endif /* DEBUG */
 
 /*
@@ -49,8 +49,14 @@ static const char CVS_ID[] = "@(#) $RCSfile: constants.c,v $ $Revision: 1.6 $ $D
 #include "nssckt.h"
 #endif /* NSSCKT_H */
 
+#ifndef NSSCKBI_H
+#include "nssckbi.h"
+#endif /* NSSCKBI_H */
+
 NSS_IMPLEMENT_DATA const CK_VERSION
-nss_builtins_CryptokiVersion = { 2, 1 };
+nss_builtins_CryptokiVersion =  {
+		NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR,
+		NSS_BUILTINS_CRYPTOKI_VERSION_MINOR };
 
 NSS_IMPLEMENT_DATA const NSSUTF8 *
 nss_builtins_ManufacturerID = (NSSUTF8 *) "Netscape Communications Corp.";
@@ -59,16 +65,22 @@ NSS_IMPLEMENT_DATA const NSSUTF8 *
 nss_builtins_LibraryDescription = (NSSUTF8 *) "NSS Builtin Object Cryptoki Module";
 
 NSS_IMPLEMENT_DATA const CK_VERSION
-nss_builtins_LibraryVersion = { 1, 2 };
+nss_builtins_LibraryVersion = {
+	NSS_BUILTINS_LIBRARY_VERISON_MAJOR,
+	NSS_BUILTINS_LIBRARY_VERISON_MINOR};
 
 NSS_IMPLEMENT_DATA const NSSUTF8 *
 nss_builtins_SlotDescription = (NSSUTF8 *) "";
 
 NSS_IMPLEMENT_DATA const CK_VERSION
-nss_builtins_HardwareVersion = { 1, 0 };
+nss_builtins_HardwareVersion = { 
+	NSS_BUILTINS_HARDWARE_VERISON_MAJOR,
+	NSS_BUILTINS_HARDWARE_VERISON_MINOR };
 
 NSS_IMPLEMENT_DATA const CK_VERSION
-nss_builtins_FirmwareVersion = { 1, 0 };
+nss_builtins_FirmwareVersion = { 
+	NSS_BUILTINS_FIRMWARE_VERISON_MAJOR,
+	NSS_BUILTINS_FIRMWARE_VERISON_MINOR };
 
 NSS_IMPLEMENT_DATA const NSSUTF8 *
 nss_builtins_TokenLabel = (NSSUTF8 *) "Builtin Object Token";

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

@@ -30,17 +30,21 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-MANIFEST_CVS_ID = "@(#) $RCSfile: manifest.mn,v $ $Revision: 1.4 $ $Date: 2002-02-08 00:10:07 $ $Name:  $"
+MANIFEST_CVS_ID = "@(#) $RCSfile: manifest.mn,v $ $Revision: 1.5 $ $Date: 2002-08-28 22:12:58 $ $Name:  $"
 
 CORE_DEPTH = ../../../..
 
 MODULE = security
 
+EXPORTS =		\
+	nssckbi.h	\
+	$(NULL)
+
 CSRCS =			\
 	anchor.c	\
 	constants.c	\
 	bfind.c		\
-	binst.c	\
+	binst.c 	\
 	bobject.c	\
 	bsession.c	\
 	bslot.c		\