зеркало из https://github.com/mozilla/pjs.git
Bug 402285 - built-in root certs module shows no slot name. r=wtc
Modified Files: binst.c bslot.c btoken.c builtins.h certdata.c certdata.perl constants.c
This commit is contained in:
nelson%bolyard.com
Родитель
3517e56675
Коммит
d8e3d7c6e3
|
|
@ -35,7 +35,7 @@
|
|||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: binst.c,v $ $Revision: 1.4 $ $Date: 2006-06-13 17:48:03 $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: binst.c,v $ $Revision: 1.5 $ $Date: 2008-01-23 07:34:49 $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
#include "builtins.h"
|
||||
|
|
@ -121,7 +121,7 @@ builtins_mdInstance_GetSlots
|
|||
return CKR_OK;
|
||||
}
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSCKMDInstance
|
||||
const NSSCKMDInstance
|
||||
nss_builtins_mdInstance = {
|
||||
(void *)NULL, /* etc */
|
||||
NULL, /* Initialize */
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: bslot.c,v $ $Revision: 1.3 $ $Date: 2005-01-20 02:25:46 $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: bslot.c,v $ $Revision: 1.4 $ $Date: 2008-01-23 07:34:49 $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
#include "builtins.h"
|
||||
|
|
@ -110,7 +110,7 @@ builtins_mdSlot_GetToken
|
|||
return (NSSCKMDToken *)&nss_builtins_mdToken;
|
||||
}
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSCKMDSlot
|
||||
const NSSCKMDSlot
|
||||
nss_builtins_mdSlot = {
|
||||
(void *)NULL, /* etc */
|
||||
NULL, /* Initialize */
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: btoken.c,v $ $Revision: 1.3 $ $Date: 2005-01-20 02:25:46 $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: btoken.c,v $ $Revision: 1.4 $ $Date: 2008-01-23 07:34:49 $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
#include "builtins.h"
|
||||
|
|
@ -150,7 +150,7 @@ builtins_mdToken_OpenSession
|
|||
return nss_builtins_CreateSession(fwSession, pError);
|
||||
}
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSCKMDToken
|
||||
const NSSCKMDToken
|
||||
nss_builtins_mdToken = {
|
||||
(void *)NULL, /* etc */
|
||||
NULL, /* Setup */
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char BUILTINS_CVS_ID[] = "@(#) $RCSfile: builtins.h,v $ $Revision: 1.5 $ $Date: 2005-01-20 02:25:46 $";
|
||||
static const char BUILTINS_CVS_ID[] = "@(#) $RCSfile: builtins.h,v $ $Revision: 1.6 $ $Date: 2008-01-23 07:34:49 $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
#include "nssckmdt.h"
|
||||
|
|
@ -64,23 +64,24 @@ struct builtinsInternalObjectStr {
|
|||
};
|
||||
typedef struct builtinsInternalObjectStr builtinsInternalObject;
|
||||
|
||||
NSS_EXTERN_DATA builtinsInternalObject nss_builtins_data[];
|
||||
NSS_EXTERN_DATA const PRUint32 nss_builtins_nObjects;
|
||||
extern builtinsInternalObject nss_builtins_data[];
|
||||
extern const PRUint32 nss_builtins_nObjects;
|
||||
|
||||
NSS_EXTERN_DATA const CK_VERSION nss_builtins_CryptokiVersion;
|
||||
NSS_EXTERN_DATA const NSSUTF8 * nss_builtins_ManufacturerID;
|
||||
NSS_EXTERN_DATA const NSSUTF8 * nss_builtins_LibraryDescription;
|
||||
NSS_EXTERN_DATA const CK_VERSION nss_builtins_LibraryVersion;
|
||||
NSS_EXTERN_DATA const NSSUTF8 * nss_builtins_SlotDescription;
|
||||
NSS_EXTERN_DATA const CK_VERSION nss_builtins_HardwareVersion;
|
||||
NSS_EXTERN_DATA const CK_VERSION nss_builtins_FirmwareVersion;
|
||||
NSS_EXTERN_DATA const NSSUTF8 * nss_builtins_TokenLabel;
|
||||
NSS_EXTERN_DATA const NSSUTF8 * nss_builtins_TokenModel;
|
||||
NSS_EXTERN_DATA const NSSUTF8 * nss_builtins_TokenSerialNumber;
|
||||
extern const CK_VERSION nss_builtins_CryptokiVersion;
|
||||
extern const CK_VERSION nss_builtins_LibraryVersion;
|
||||
extern const CK_VERSION nss_builtins_HardwareVersion;
|
||||
extern const CK_VERSION nss_builtins_FirmwareVersion;
|
||||
|
||||
NSS_EXTERN_DATA const NSSCKMDInstance nss_builtins_mdInstance;
|
||||
NSS_EXTERN_DATA const NSSCKMDSlot nss_builtins_mdSlot;
|
||||
NSS_EXTERN_DATA const NSSCKMDToken nss_builtins_mdToken;
|
||||
extern const NSSUTF8 nss_builtins_ManufacturerID[];
|
||||
extern const NSSUTF8 nss_builtins_LibraryDescription[];
|
||||
extern const NSSUTF8 nss_builtins_SlotDescription[];
|
||||
extern const NSSUTF8 nss_builtins_TokenLabel[];
|
||||
extern const NSSUTF8 nss_builtins_TokenModel[];
|
||||
extern const NSSUTF8 nss_builtins_TokenSerialNumber[];
|
||||
|
||||
extern const NSSCKMDInstance nss_builtins_mdInstance;
|
||||
extern const NSSCKMDSlot nss_builtins_mdSlot;
|
||||
extern const NSSCKMDToken nss_builtins_mdToken;
|
||||
|
||||
NSS_EXTERN NSSCKMDSession *
|
||||
nss_builtins_CreateSession
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.45 $ $Date: 2008-01-17 19:07:51 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.45 $ $Date: 2008-01-17 19:07:51 $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.46 $ $Date: 2008-01-23 07:34:49 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.46 $ $Date: 2008-01-23 07:34:49 $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
#ifndef BUILTINS_H
|
||||
|
|
@ -751,7 +751,7 @@ static const NSSItem nss_builtins_items_0 [] = {
|
|||
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||
{ (void *)"CVS ID", (PRUint32)7 },
|
||||
{ (void *)"NSS", (PRUint32)4 },
|
||||
{ (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.45 $ $Date: 2008-01-17 19:07:51 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.45 $ $Date: 2008-01-17 19:07:51 $", (PRUint32)160 }
|
||||
{ (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.46 $ $Date: 2008-01-23 07:34:49 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.46 $ $Date: 2008-01-23 07:34:49 $", (PRUint32)160 }
|
||||
};
|
||||
#endif /* DEBUG */
|
||||
static const NSSItem nss_builtins_items_1 [] = {
|
||||
|
|
@ -15520,7 +15520,7 @@ static const NSSItem nss_builtins_items_229 [] = {
|
|||
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
|
||||
};
|
||||
|
||||
PR_IMPLEMENT_DATA(builtinsInternalObject)
|
||||
builtinsInternalObject
|
||||
nss_builtins_data[] = {
|
||||
#ifdef DEBUG
|
||||
{ 7, nss_builtins_types_0, nss_builtins_items_0, {NULL} },
|
||||
|
|
@ -15755,7 +15755,7 @@ nss_builtins_data[] = {
|
|||
{ 11, nss_builtins_types_228, nss_builtins_items_228, {NULL} },
|
||||
{ 13, nss_builtins_types_229, nss_builtins_items_229, {NULL} }
|
||||
};
|
||||
PR_IMPLEMENT_DATA(const PRUint32)
|
||||
const PRUint32
|
||||
#ifdef DEBUG
|
||||
nss_builtins_nObjects = 229+1;
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
my $cvs_id = '@(#) $RCSfile: certdata.perl,v $ $Revision: 1.11 $ $Date: 2006-07-17 16:50:45 $';
|
||||
my $cvs_id = '@(#) $RCSfile: certdata.perl,v $ $Revision: 1.12 $ $Date: 2008-01-23 07:34:49 $';
|
||||
use strict;
|
||||
|
||||
my %constants;
|
||||
|
|
@ -266,7 +266,7 @@ for( $i = 0; $i <= $count; $i++ ) {
|
|||
}
|
||||
}
|
||||
|
||||
print CFILE "\nPR_IMPLEMENT_DATA(builtinsInternalObject)\n";
|
||||
print CFILE "\nbuiltinsInternalObject\n";
|
||||
print CFILE "nss_builtins_data[] = {\n";
|
||||
|
||||
for( $i = 0; $i <= $count; $i++ ) {
|
||||
|
|
@ -290,7 +290,7 @@ for( $i = 0; $i <= $count; $i++ ) {
|
|||
|
||||
print CFILE "};\n";
|
||||
|
||||
print CFILE "PR_IMPLEMENT_DATA(const PRUint32)\n";
|
||||
print CFILE "const PRUint32\n";
|
||||
print CFILE "#ifdef DEBUG\n";
|
||||
print CFILE " nss_builtins_nObjects = $count+1;\n";
|
||||
print CFILE "#else\n";
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: constants.c,v $ $Revision: 1.12 $ $Date: 2007-07-10 22:35:19 $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: constants.c,v $ $Revision: 1.13 $ $Date: 2008-01-23 07:34:49 $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -56,42 +56,42 @@ static const char CVS_ID[] = "@(#) $RCSfile: constants.c,v $ $Revision: 1.12 $ $
|
|||
#include "nssckbi.h"
|
||||
#endif /* NSSCKBI_H */
|
||||
|
||||
NSS_IMPLEMENT_DATA const CK_VERSION
|
||||
const CK_VERSION
|
||||
nss_builtins_CryptokiVersion = {
|
||||
NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR,
|
||||
NSS_BUILTINS_CRYPTOKI_VERSION_MINOR };
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_ManufacturerID = (NSSUTF8 *) "Mozilla Foundation";
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_LibraryDescription = (NSSUTF8 *) "NSS Builtin Object Cryptoki Module";
|
||||
|
||||
NSS_IMPLEMENT_DATA const CK_VERSION
|
||||
const CK_VERSION
|
||||
nss_builtins_LibraryVersion = {
|
||||
NSS_BUILTINS_LIBRARY_VERSION_MAJOR,
|
||||
NSS_BUILTINS_LIBRARY_VERSION_MINOR};
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_SlotDescription = (NSSUTF8 *) "NSS Builtin Objects";
|
||||
|
||||
NSS_IMPLEMENT_DATA const CK_VERSION
|
||||
const CK_VERSION
|
||||
nss_builtins_HardwareVersion = {
|
||||
NSS_BUILTINS_HARDWARE_VERSION_MAJOR,
|
||||
NSS_BUILTINS_HARDWARE_VERSION_MINOR };
|
||||
|
||||
NSS_IMPLEMENT_DATA const CK_VERSION
|
||||
const CK_VERSION
|
||||
nss_builtins_FirmwareVersion = {
|
||||
NSS_BUILTINS_FIRMWARE_VERSION_MAJOR,
|
||||
NSS_BUILTINS_FIRMWARE_VERSION_MINOR };
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_TokenLabel = (NSSUTF8 *) "Builtin Object Token";
|
||||
const NSSUTF8
|
||||
nss_builtins_ManufacturerID[] = { "Mozilla Foundation" };
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_TokenModel = (NSSUTF8 *) "1";
|
||||
const NSSUTF8
|
||||
nss_builtins_LibraryDescription[] = { "NSS Builtin Object Cryptoki Module" };
|
||||
|
||||
const NSSUTF8
|
||||
nss_builtins_SlotDescription[] = { "NSS Builtin Objects" };
|
||||
|
||||
const NSSUTF8
|
||||
nss_builtins_TokenLabel[] = { "Builtin Object Token" };
|
||||
|
||||
const NSSUTF8
|
||||
nss_builtins_TokenModel[] = { "1" };
|
||||
|
||||
/* should this be e.g. the certdata.txt RCS revision number? */
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_TokenSerialNumber = (NSSUTF8 *) "1";
|
||||
const NSSUTF8
|
||||
nss_builtins_TokenSerialNumber[] = { "1" };
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче