diff options
| author | relyea%netscape.com <devnull@localhost> | 2002-08-28 22:12:58 +0000 |
|---|---|---|
| committer | relyea%netscape.com <devnull@localhost> | 2002-08-28 22:12:58 +0000 |
| commit | 76762d1a25c890d38ef142aea5832734083e0abb (patch) | |
| tree | 74527e48789d4d4a41035e3fe44531018a3e41ca | |
| parent | b4a43e54a2ee168df53dab4f6ddc8b06ab71a5fc (diff) | |
| download | nss-hg-76762d1a25c890d38ef142aea5832734083e0abb.tar.gz | |
Put version number in an external header so applications can check if they
are using an up-to-date builtins module.
| -rw-r--r-- | security/nss/lib/ckfw/builtins/constants.c | 20 | ||||
| -rw-r--r-- | security/nss/lib/ckfw/builtins/manifest.mn | 6 |
2 files changed, 21 insertions, 5 deletions
diff --git a/security/nss/lib/ckfw/builtins/constants.c b/security/nss/lib/ckfw/builtins/constants.c index d58fbbbc9..7cae3aee2 100644 --- a/security/nss/lib/ckfw/builtins/constants.c +++ b/security/nss/lib/ckfw/builtins/constants.c @@ -49,8 +49,14 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$"; #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"; diff --git a/security/nss/lib/ckfw/builtins/manifest.mn b/security/nss/lib/ckfw/builtins/manifest.mn index cc71a7194..4ccb55b62 100644 --- a/security/nss/lib/ckfw/builtins/manifest.mn +++ b/security/nss/lib/ckfw/builtins/manifest.mn @@ -36,11 +36,15 @@ 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 \ |