зеркало из https://github.com/mozilla/gecko-dev.git
Make the framework compile with the rest of NSS.
Include a 'live' certdata.txt with those certs we have permission to push to open source (additional certs will be added as we get permission from the owners).
This commit is contained in:
relyea%netscape.com
Родитель
30037f6c30
Коммит
7b234beea7
|
|
@ -30,7 +30,7 @@
|
|||
# may use your version of this file under either the MPL or the
|
||||
# GPL.
|
||||
#
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.1 $ $Date: 2000/03/31 19:43:09 $ $Name: $"
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.2 $ $Date: 2000/09/06 22:23:55 $ $Name: $"
|
||||
|
||||
include manifest.mn
|
||||
include config.mk
|
||||
|
|
@ -42,5 +42,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
nssckepv.h: ck.api ckapi.perl
|
||||
nssckft.h: ck.api ckapi.perl
|
||||
nssckg.h: ck.api ckapi.perl
|
||||
nssck.api: ck.api ckapi.perl
|
||||
perl ckapi.perl < ck.api
|
||||
|
||||
export:: private_export
|
||||
|
||||
|
|
|
|||
|
|
@ -30,14 +30,65 @@
|
|||
# may use your version of this file under either the MPL or the
|
||||
# GPL.
|
||||
#
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.1 $ $Date: 2000/03/31 19:43:46 $ $Name: $"
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.2 $ $Date: 2000/09/06 22:23:59 $ $Name: $"
|
||||
|
||||
include manifest.mn
|
||||
include config.mk
|
||||
# can't do this in manifest.mn because OS_ARCH isn't defined there.
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
|
||||
EXTRA_LIBS = \
|
||||
$(DIST)/lib/nssckfw.lib \
|
||||
$(DIST)/lib/nssb.lib \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
|
||||
wsock32.lib \
|
||||
winmm.lib \
|
||||
$(NULL)
|
||||
|
||||
else
|
||||
|
||||
# OSF 1 linker is very agressive. It includes the entire archive,
|
||||
# not just the .o's that we need from that archive.
|
||||
#
|
||||
ifneq ($(OS_ARCH), OSF1)
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(DIST)/lib/libnssckfw.a \
|
||||
$(DIST)/lib/libnssb.a \
|
||||
$(DIST)/lib/libplc4.a \
|
||||
$(DIST)/lib/libplds4.a \
|
||||
$(NULL)
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/config.mk
|
||||
include $(CORE_DEPTH)/coreconf/rules.mk
|
||||
|
||||
# This'll need some help from a build person.
|
||||
|
||||
certdata.c: certdata.txt certdata.perl
|
||||
perl certdata.perl < certdata.txt
|
||||
|
||||
# This'll need some help from a build person.
|
||||
|
||||
|
||||
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
|
||||
DSO_LDOPTS = -bM:SRE -bh:4 -bnoentry
|
||||
EXTRA_DSO_LDOPTS = -lc
|
||||
MKSHLIB = xlC $(DSO_LDOPTS)
|
||||
|
||||
$(SHARED_LIBRARY): $(OBJS)
|
||||
@$(MAKE_OBJDIR)
|
||||
rm -f $@
|
||||
$(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(EXTRA_DSO_LDOPTS)
|
||||
chmod +x $@
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2)
|
||||
LD += -G
|
||||
endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
# may use your version of this file under either the MPL or the
|
||||
# GPL.
|
||||
#
|
||||
my $cvs_id = '@(#) $RCSfile: certdata.perl,v $ $Revision: 1.5 $ $Date: 2000/05/09 18:35:24 $ $Name: $';
|
||||
my $cvs_id = '@(#) $RCSfile: certdata.perl,v $ $Revision: 1.6 $ $Date: 2000/09/06 22:23:59 $ $Name: $';
|
||||
use strict;
|
||||
|
||||
my %constants;
|
||||
|
|
@ -132,25 +132,25 @@ while(<>) {
|
|||
|
||||
@{$objects[$count][$objsize[$count]++]} = ( "$fields[0]", $fields[2], "$size" );
|
||||
|
||||
# print "$fields[0] | $fields[1] | $size | $fields[2]\n";
|
||||
# print "$fields[0] | $fields[1] | $size | $fields[2]\n";
|
||||
}
|
||||
|
||||
doprint();
|
||||
|
||||
sub dudump {
|
||||
my $i;
|
||||
#for( $i = 0; $i <= $count; $i++ ) {
|
||||
# print "\n";
|
||||
# $o = $objects[$i];
|
||||
# my @ob = @{$o};
|
||||
# my $l;
|
||||
# my $j;
|
||||
# for( $j = 0; $j < @ob; $j++ ) {
|
||||
# $l = $ob[$j];
|
||||
# my @a = @{$l};
|
||||
# print "$a[0] ! $a[1] ! $a[2]\n";
|
||||
# }
|
||||
#}
|
||||
for( $i = 0; $i <= $count; $i++ ) {
|
||||
print "\n";
|
||||
$o = $objects[$i];
|
||||
my @ob = @{$o};
|
||||
my $l;
|
||||
my $j;
|
||||
for( $j = 0; $j < @ob; $j++ ) {
|
||||
$l = $ob[$j];
|
||||
my @a = @{$l};
|
||||
print "$a[0] ! $a[1] ! $a[2]\n";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -215,6 +215,7 @@ for( $i = 0; $i <= $count; $i++ ) {
|
|||
|
||||
print CFILE "static const CK_ATTRIBUTE_TYPE nss_builtins_types_$i [] = {\n";
|
||||
$o = $objects[$i];
|
||||
# print STDOUT "type $i object $o \n";
|
||||
my @ob = @{$o};
|
||||
my $j;
|
||||
for( $j = 0; $j < @ob; $j++ ) {
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: constants.c,v $ $Revision: 1.2 $ $Date: 2000/04/19 21:32:38 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: constants.c,v $ $Revision: 1.3 $ $Date: 2000/09/06 22:24:00 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -53,10 +53,10 @@ NSS_IMPLEMENT_DATA const CK_VERSION
|
|||
nss_builtins_CryptokiVersion = { 2, 1 };
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_ManufacturerID = "Netscape Communications Corp.";
|
||||
nss_builtins_ManufacturerID = (NSSUTF8 *) "Netscape Communications Corp.";
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_LibraryDescription = "NSS Builtin Object Cryptoki Module";
|
||||
nss_builtins_LibraryDescription = (NSSUTF8 *) "NSS Builtin Object Cryptoki Module";
|
||||
|
||||
NSS_IMPLEMENT_DATA const CK_VERSION
|
||||
nss_builtins_LibraryVersion = { 1, 0 };
|
||||
|
|
@ -71,12 +71,12 @@ NSS_IMPLEMENT_DATA const CK_VERSION
|
|||
nss_builtins_FirmwareVersion = { 1, 0 };
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_TokenLabel = "Builtin Object Token";
|
||||
nss_builtins_TokenLabel = (NSSUTF8 *) "Builtin Object Token";
|
||||
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_TokenModel = "1";
|
||||
nss_builtins_TokenModel = (NSSUTF8 *) "1";
|
||||
|
||||
/* should this be e.g. the certdata.txt RCS revision number? */
|
||||
NSS_IMPLEMENT_DATA const NSSUTF8 *
|
||||
nss_builtins_TokenSerialNumber = "1";
|
||||
nss_builtins_TokenSerialNumber = (NSSUTF8 *) "1";
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
# may use your version of this file under either the MPL or the
|
||||
# GPL.
|
||||
#
|
||||
MANIFEST_CVS_ID = "@(#) $RCSfile: manifest.mn,v $ $Revision: 1.2 $ $Date: 2000/04/19 21:32:38 $ $Name: $"
|
||||
MANIFEST_CVS_ID = "@(#) $RCSfile: manifest.mn,v $ $Revision: 1.3 $ $Date: 2000/09/06 22:24:00 $ $Name: $"
|
||||
|
||||
CORE_DEPTH = ../../../..
|
||||
|
||||
|
|
@ -52,4 +52,4 @@ REQUIRES = security nspr
|
|||
|
||||
LIBRARY_NAME = nssckbi
|
||||
|
||||
EXTRA_SHARED_LIBS = -L$(DIST)/lib -lnssckfw -lnssb -lnspr4 -lplc4 -lplds4
|
||||
#EXTRA_SHARED_LIBS = -L$(DIST)/lib -lnssckfw -lnssb -lplc4 -lplds4
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#define CKT_H
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CKT_CVS_ID[] = "@(#) $RCSfile: ckt.h,v $ $Revision: 1.1 $ $Date: 2000/03/31 19:43:13 $ $Name: $";
|
||||
static const char CKT_CVS_ID[] = "@(#) $RCSfile: ckt.h,v $ $Revision: 1.2 $ $Date: 2000/09/06 22:23:55 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -72,6 +72,7 @@ static const char CKT_CVS_ID[] = "@(#) $RCSfile: ckt.h,v $ $Revision: 1.1 $ $Dat
|
|||
#define CKO_NETSCAPE_CRL (CKO_NETSCAPE + 1)
|
||||
#define CKO_NETSCAPE_SMIME (CKO_NETSCAPE + 2)
|
||||
#define CKO_NETSCAPE_TRUST (CKO_NETSCAPE + 3)
|
||||
#define CKO_NETSCAPE_BUILTIN_ROOT_LIST (CKO_NETSCAPE + 4)
|
||||
|
||||
/*
|
||||
* Netscape-defined key types
|
||||
|
|
@ -127,6 +128,8 @@ static const char CKT_CVS_ID[] = "@(#) $RCSfile: ckt.h,v $ $Revision: 1.1 $ $Dat
|
|||
#define CKA_TRUST_IPSEC_TUNNEL (CKA_TRUST + 13)
|
||||
#define CKA_TRUST_IPSEC_USER (CKA_TRUST + 14)
|
||||
#define CKA_TRUST_TIME_STAMPING (CKA_TRUST + 15)
|
||||
#define CKA_CERT_SHA1_HASH (CKA_TRUST + 100)
|
||||
#define CKA_CERT_MD5_HASH (CKA_TRUST + 101)
|
||||
|
||||
/* Netscape trust stuff */
|
||||
/* XXX fgmr new ones here-- step-up, etc. */
|
||||
|
|
|
|||
|
|
@ -30,8 +30,26 @@
|
|||
# may use your version of this file under either the MPL or the
|
||||
# GPL.
|
||||
#
|
||||
CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.1 $ $Date: 2000/03/31 19:43:14 $ $Name: $"
|
||||
CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.2 $ $Date: 2000/09/06 22:23:55 $ $Name: $"
|
||||
|
||||
ifdef BUILD_IDG
|
||||
DEFINES += -DNSSDEBUG
|
||||
endif
|
||||
|
||||
#
|
||||
# Hack to see if everything still builds
|
||||
#
|
||||
|
||||
|
||||
#
|
||||
# Override TARGETS variable so that only static libraries
|
||||
# are specifed as dependencies within rules.mk.
|
||||
#
|
||||
|
||||
TARGETS = $(LIBRARY)
|
||||
SHARED_LIBRARY =
|
||||
IMPORT_LIBRARY =
|
||||
PURE_LIBRARY =
|
||||
PROGRAM =
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: instance.c,v $ $Revision: 1.2 $ $Date: 2000/04/19 21:31:49 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: instance.c,v $ $Revision: 1.3 $ $Date: 2000/09/06 22:23:55 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -959,11 +959,11 @@ nssCKFWInstance_GetManufacturerID
|
|||
goto done;
|
||||
}
|
||||
} else {
|
||||
fwInstance->manufacturerID = "";
|
||||
fwInstance->manufacturerID = (NSSUTF8 *) "";
|
||||
}
|
||||
}
|
||||
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwInstance->manufacturerID, manufacturerID, 32, ' ');
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwInstance->manufacturerID, (char *)manufacturerID, 32, ' ');
|
||||
error = CKR_OK;
|
||||
|
||||
done:
|
||||
|
|
@ -1028,11 +1028,11 @@ nssCKFWInstance_GetLibraryDescription
|
|||
goto done;
|
||||
}
|
||||
} else {
|
||||
fwInstance->libraryDescription = "";
|
||||
fwInstance->libraryDescription = (NSSUTF8 *) "";
|
||||
}
|
||||
}
|
||||
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwInstance->libraryDescription, libraryDescription, 32, ' ');
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwInstance->libraryDescription, (char *)libraryDescription, 32, ' ');
|
||||
error = CKR_OK;
|
||||
|
||||
done:
|
||||
|
|
|
|||
|
|
@ -30,10 +30,12 @@
|
|||
# may use your version of this file under either the MPL or the
|
||||
# GPL.
|
||||
#
|
||||
MANIFEST_CVS_ID = "@(#) $RCSfile: manifest.mn,v $ $Revision: 1.2 $ $Date: 2000/05/09 18:31:14 $ $Name: $"
|
||||
MANIFEST_CVS_ID = "@(#) $RCSfile: manifest.mn,v $ $Revision: 1.3 $ $Date: 2000/09/06 22:23:56 $ $Name: $"
|
||||
|
||||
CORE_DEPTH = ../../..
|
||||
|
||||
DIRS = builtins
|
||||
|
||||
PRIVATE_EXPORTS = \
|
||||
ck.h \
|
||||
ckfw.h \
|
||||
|
|
@ -64,12 +66,14 @@ CSRCS = \
|
|||
hash.c \
|
||||
instance.c \
|
||||
mutex.c \
|
||||
nsprstub.c \
|
||||
object.c \
|
||||
session.c \
|
||||
sessobj.c \
|
||||
slot.c \
|
||||
token.c \
|
||||
wrap.c \
|
||||
mechanism.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = security nspr
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: sessobj.c,v $ $Revision: 1.4 $ $Date: 2000/04/20 03:14:13 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: sessobj.c,v $ $Revision: 1.5 $ $Date: 2000/09/06 22:23:56 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -1012,6 +1012,7 @@ nssCKMDFindSessionObjects_Create
|
|||
return (NSSCKMDFindObjects *)NULL;
|
||||
}
|
||||
#endif /* DEBUG */
|
||||
mdfso->arena = arena;
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
|
@ -1038,7 +1039,7 @@ nss_ckmdFindSessionObjects_Final
|
|||
#endif /* NSSDEBUG */
|
||||
|
||||
mdfso = (nssCKMDFindSessionObjects *)mdFindObjects->etc;
|
||||
NSSArena_Destroy(mdfso->arena);
|
||||
if (mdfso->arena) NSSArena_Destroy(mdfso->arena);
|
||||
|
||||
#ifdef DEBUG
|
||||
(void)nss_ckmdFindSessionObjects_remove_pointer(mdFindObjects);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: slot.c,v $ $Revision: 1.2 $ $Date: 2000/04/20 03:14:29 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: slot.c,v $ $Revision: 1.3 $ $Date: 2000/09/06 22:23:57 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -387,11 +387,11 @@ nssCKFWSlot_GetSlotDescription
|
|||
goto done;
|
||||
}
|
||||
} else {
|
||||
fwSlot->slotDescription = "";
|
||||
fwSlot->slotDescription = (NSSUTF8 *) "";
|
||||
}
|
||||
}
|
||||
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwSlot->slotDescription, slotDescription, 64, ' ');
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwSlot->slotDescription, (char *)slotDescription, 64, ' ');
|
||||
error = CKR_OK;
|
||||
|
||||
done:
|
||||
|
|
@ -437,11 +437,11 @@ nssCKFWSlot_GetManufacturerID
|
|||
goto done;
|
||||
}
|
||||
} else {
|
||||
fwSlot->manufacturerID = "";
|
||||
fwSlot->manufacturerID = (NSSUTF8 *) "";
|
||||
}
|
||||
}
|
||||
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwSlot->manufacturerID, manufacturerID, 32, ' ');
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwSlot->manufacturerID, (char *)manufacturerID, 32, ' ');
|
||||
error = CKR_OK;
|
||||
|
||||
done:
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.3 $ $Date: 2000/04/20 03:14:41 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.4 $ $Date: 2000/09/06 22:23:57 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -510,7 +510,7 @@ nssCKFWToken_InitToken
|
|||
}
|
||||
|
||||
if( (NSSUTF8 *)NULL == label ) {
|
||||
label = "";
|
||||
label = (NSSUTF8 *) "";
|
||||
}
|
||||
|
||||
error = fwToken->mdToken->InitToken(fwToken->mdToken, fwToken,
|
||||
|
|
@ -558,11 +558,11 @@ nssCKFWToken_GetLabel
|
|||
goto done;
|
||||
}
|
||||
} else {
|
||||
fwToken->label = "";
|
||||
fwToken->label = (NSSUTF8 *) "";
|
||||
}
|
||||
}
|
||||
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwToken->label, label, 32, ' ');
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwToken->label, (char *)label, 32, ' ');
|
||||
error = CKR_OK;
|
||||
|
||||
done:
|
||||
|
|
@ -607,11 +607,11 @@ nssCKFWToken_GetManufacturerID
|
|||
goto done;
|
||||
}
|
||||
} else {
|
||||
fwToken->manufacturerID = "";
|
||||
fwToken->manufacturerID = (NSSUTF8 *)"";
|
||||
}
|
||||
}
|
||||
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwToken->manufacturerID, manufacturerID, 32, ' ');
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwToken->manufacturerID, (char *)manufacturerID, 32, ' ');
|
||||
error = CKR_OK;
|
||||
|
||||
done:
|
||||
|
|
@ -656,11 +656,11 @@ nssCKFWToken_GetModel
|
|||
goto done;
|
||||
}
|
||||
} else {
|
||||
fwToken->model = "";
|
||||
fwToken->model = (NSSUTF8 *)"";
|
||||
}
|
||||
}
|
||||
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwToken->model, model, 16, ' ');
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwToken->model, (char *)model, 16, ' ');
|
||||
error = CKR_OK;
|
||||
|
||||
done:
|
||||
|
|
@ -705,11 +705,11 @@ nssCKFWToken_GetSerialNumber
|
|||
goto done;
|
||||
}
|
||||
} else {
|
||||
fwToken->serialNumber = "";
|
||||
fwToken->serialNumber = (NSSUTF8 *)"";
|
||||
}
|
||||
}
|
||||
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwToken->serialNumber, serialNumber, 16, ' ');
|
||||
(void)nssUTF8_CopyIntoFixedBuffer(fwToken->serialNumber, (char *)serialNumber, 16, ' ');
|
||||
error = CKR_OK;
|
||||
|
||||
done:
|
||||
|
|
@ -1218,7 +1218,7 @@ nssCKFWToken_GetUTCTime
|
|||
|
||||
if( CK_TRUE != nssCKFWToken_GetHasClockOnToken(fwToken) ) {
|
||||
/* return CKR_DEVICE_ERROR; */
|
||||
(void)nssUTF8_CopyIntoFixedBuffer((NSSUTF8 *)NULL, utcTime, 16, ' ');
|
||||
(void)nssUTF8_CopyIntoFixedBuffer((NSSUTF8 *)NULL, (char *)utcTime, 16, ' ');
|
||||
return CKR_OK;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: wrap.c,v $ $Revision: 1.2 $ $Date: 2000/04/19 21:32:26 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: wrap.c,v $ $Revision: 1.3 $ $Date: 2000/09/06 22:23:57 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
|
@ -151,6 +151,11 @@ NSSCKFWC_Initialize
|
|||
goto loser;
|
||||
}
|
||||
|
||||
/* remember the locking args for those times we need to get a lock in code
|
||||
* outside the framework.
|
||||
*/
|
||||
nssSetLockArgs(pInitArgs);
|
||||
|
||||
*pFwInstance = nssCKFWInstance_Create(pInitArgs, mdInstance, &error);
|
||||
if( (NSSCKFWInstance *)NULL == *pFwInstance ) {
|
||||
goto loser;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче