mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 120651: Stop up memory leaks in the built-in token. We are slowly leaking 

memory in arenas by allocating temporary objects out of permanment arenas.

Also rename file sin the builtins directory that conflict with it's parent.

xxxxx.c -> bxxxx.c except instance.c becomes binst.c
This commit is contained in:
relyea%netscape.com 2002-02-08 00:10:07 +00:00
Родитель 9302b1672b
Коммит 677f4822c8
13 изменённых файлов: 226 добавлений и 222 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
security/nss/lib/ckfw/builtins/find.c → security/nss/lib/ckfw/builtins/bfind.c
Просмотреть файл

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: find.c,v $ $Revision: 1.3 $ $Date: 2001-01-05 01:38:06 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: bfind.c,v $ $Revision: 1.1 $ $Date: 2002-02-08 00:10:02 $ $Name: $";
#endif /* DEBUG */
#ifndef BUILTINS_H
@ -67,9 +67,13 @@ builtins_mdFindObjects_Final
)
{
struct builtinsFOStr *fo = (struct builtinsFOStr *)mdFindObjects->etc;
NSSArena *arena = fo->arena;
nss_ZFreeIf(fo->objs);
nss_ZFreeIf(fo);
if ((NSSArena *)NULL != arena) {
NSSArena_Destroy(arena);
}
return;
}
@ -175,7 +179,7 @@ nss_builtins_FindObjectsInit
builtinsInternalObject **temp = (builtinsInternalObject **)NULL;
PRUint32 i;
arena = NSSCKFWSession_GetArena(fwSession, pError);
arena = NSSArena_Create();
if( (NSSArena *)NULL == arena ) {
goto loser;
}

2
security/nss/lib/ckfw/builtins/instance.c → security/nss/lib/ckfw/builtins/binst.c
Просмотреть файл

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: instance.c,v $ $Revision: 1.1 $ $Date: 2000-03-31 19:43:49 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: binst.c,v $ $Revision: 1.1 $ $Date: 2002-02-08 00:10:02 $ $Name: $";
#endif /* DEBUG */
#include "builtins.h"

19
security/nss/lib/ckfw/builtins/object.c → security/nss/lib/ckfw/builtins/bobject.c
Просмотреть файл

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: object.c,v $ $Revision: 1.2 $ $Date: 2001-01-05 01:38:07 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: bobject.c,v $ $Revision: 1.1 $ $Date: 2002-02-08 00:10:03 $ $Name: $";
#endif /* DEBUG */
#include "builtins.h"
@ -216,7 +216,7 @@ builtins_mdObject_GetObjectSize
return rv;
}
static NSSCKMDObject
static const NSSCKMDObject
builtins_prototype_mdObject = {
(void *)NULL, /* etc */
NULL, /* Finalize */
@ -239,16 +239,11 @@ nss_builtins_CreateMDObject
CK_RV *pError
)
{
NSSCKMDObject *rv;
rv = nss_ZNEW(arena, NSSCKMDObject);
if( (NSSCKMDObject *)NULL == rv ) {
*pError = CKR_HOST_MEMORY;
return (NSSCKMDObject *)NULL;
if ( (void*)NULL == io->mdObject.etc) {
(void) nsslibc_memcpy(&io->mdObject,&builtins_prototype_mdObject,
sizeof(builtins_prototype_mdObject));
io->mdObject.etc = (void *)io;
}
*rv = builtins_prototype_mdObject;
rv->etc = (void *)io;
return rv;
return &io->mdObject;
}

2
security/nss/lib/ckfw/builtins/session.c → security/nss/lib/ckfw/builtins/bsession.c
Просмотреть файл

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: session.c,v $ $Revision: 1.1 $ $Date: 2000-03-31 19:43:50 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: bsession.c,v $ $Revision: 1.1 $ $Date: 2002-02-08 00:10:03 $ $Name: $";
#endif /* DEBUG */
#include "builtins.h"

2
security/nss/lib/ckfw/builtins/slot.c → security/nss/lib/ckfw/builtins/bslot.c
Просмотреть файл

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: slot.c,v $ $Revision: 1.1 $ $Date: 2000-03-31 19:43:51 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: bslot.c,v $ $Revision: 1.1 $ $Date: 2002-02-08 00:10:03 $ $Name: $";
#endif /* DEBUG */
#include "builtins.h"

2
security/nss/lib/ckfw/builtins/token.c → security/nss/lib/ckfw/builtins/btoken.c
Просмотреть файл

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.1 $ $Date: 2000-03-31 19:43:53 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: btoken.c,v $ $Revision: 1.1 $ $Date: 2002-02-08 00:10:05 $ $Name: $";
#endif /* DEBUG */
#include "builtins.h"

5
security/nss/lib/ckfw/builtins/builtins.h
Просмотреть файл

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char BUILTINS_CVS_ID[] = "@(#) $RCSfile: builtins.h,v $ $Revision: 1.2 $ $Date: 2001-01-05 01:38:06 $ $Name: $";
static const char BUILTINS_CVS_ID[] = "@(#) $RCSfile: builtins.h,v $ $Revision: 1.3 $ $Date: 2002-02-08 00:10:05 $ $Name: $";
#endif /* DEBUG */
#include "nssckmdt.h"
@ -57,10 +57,11 @@ struct builtinsInternalObjectStr {
CK_ULONG n;
const CK_ATTRIBUTE_TYPE *types;
const NSSItem *items;
NSSCKMDObject mdObject;
};
typedef struct builtinsInternalObjectStr builtinsInternalObject;
NSS_EXTERN_DATA const builtinsInternalObject nss_builtins_data[];
NSS_EXTERN_DATA builtinsInternalObject nss_builtins_data[];
NSS_EXTERN_DATA const PRUint32 nss_builtins_nObjects;
NSS_EXTERN_DATA const CK_VERSION nss_builtins_CryptokiVersion;

370
security/nss/lib/ckfw/builtins/certdata.c
Просмотреть файл

@ -32,7 +32,7 @@
* GPL.
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.12 $ $Date: 2002-01-28 20:43:35 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.12 $ $Date: 2002-01-28 20:43:35 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.13 $ $Date: 2002-02-08 00:10:05 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.13 $ $Date: 2002-02-08 00:10:05 $ $Name: $";
#endif /* DEBUG */
#ifndef BUILTINS_H
@ -604,7 +604,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.12 $ $Date: 2002-01-28 20:43:35 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.12 $ $Date: 2002-01-28 20:43:35 $ $Name: $", (PRUint32)179 }
{ (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.13 $ $Date: 2002-02-08 00:10:05 $ $Name: $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.13 $ $Date: 2002-02-08 00:10:05 $ $Name: $", (PRUint32)179 }
};
#endif /* DEBUG */
static const NSSItem nss_builtins_items_1 [] = {
@ -11225,192 +11225,192 @@ static const NSSItem nss_builtins_items_181 [] = {
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
};
PR_IMPLEMENT_DATA(const builtinsInternalObject)
PR_IMPLEMENT_DATA(builtinsInternalObject)
nss_builtins_data[] = {
#ifdef DEBUG
{ 7, nss_builtins_types_0, nss_builtins_items_0 },
{ 7, nss_builtins_types_0, nss_builtins_items_0, {NULL} },
#endif /* DEBUG */
{ 5, nss_builtins_types_1, nss_builtins_items_1 },
{ 11, nss_builtins_types_2, nss_builtins_items_2 },
{ 12, nss_builtins_types_3, nss_builtins_items_3 },
{ 11, nss_builtins_types_4, nss_builtins_items_4 },
{ 12, nss_builtins_types_5, nss_builtins_items_5 },
{ 11, nss_builtins_types_6, nss_builtins_items_6 },
{ 12, nss_builtins_types_7, nss_builtins_items_7 },
{ 11, nss_builtins_types_8, nss_builtins_items_8 },
{ 12, nss_builtins_types_9, nss_builtins_items_9 },
{ 11, nss_builtins_types_10, nss_builtins_items_10 },
{ 12, nss_builtins_types_11, nss_builtins_items_11 },
{ 11, nss_builtins_types_12, nss_builtins_items_12 },
{ 12, nss_builtins_types_13, nss_builtins_items_13 },
{ 11, nss_builtins_types_14, nss_builtins_items_14 },
{ 12, nss_builtins_types_15, nss_builtins_items_15 },
{ 11, nss_builtins_types_16, nss_builtins_items_16 },
{ 12, nss_builtins_types_17, nss_builtins_items_17 },
{ 11, nss_builtins_types_18, nss_builtins_items_18 },
{ 12, nss_builtins_types_19, nss_builtins_items_19 },
{ 11, nss_builtins_types_20, nss_builtins_items_20 },
{ 12, nss_builtins_types_21, nss_builtins_items_21 },
{ 11, nss_builtins_types_22, nss_builtins_items_22 },
{ 12, nss_builtins_types_23, nss_builtins_items_23 },
{ 11, nss_builtins_types_24, nss_builtins_items_24 },
{ 12, nss_builtins_types_25, nss_builtins_items_25 },
{ 11, nss_builtins_types_26, nss_builtins_items_26 },
{ 12, nss_builtins_types_27, nss_builtins_items_27 },
{ 11, nss_builtins_types_28, nss_builtins_items_28 },
{ 12, nss_builtins_types_29, nss_builtins_items_29 },
{ 11, nss_builtins_types_30, nss_builtins_items_30 },
{ 12, nss_builtins_types_31, nss_builtins_items_31 },
{ 11, nss_builtins_types_32, nss_builtins_items_32 },
{ 12, nss_builtins_types_33, nss_builtins_items_33 },
{ 11, nss_builtins_types_34, nss_builtins_items_34 },
{ 12, nss_builtins_types_35, nss_builtins_items_35 },
{ 11, nss_builtins_types_36, nss_builtins_items_36 },
{ 12, nss_builtins_types_37, nss_builtins_items_37 },
{ 11, nss_builtins_types_38, nss_builtins_items_38 },
{ 12, nss_builtins_types_39, nss_builtins_items_39 },
{ 11, nss_builtins_types_40, nss_builtins_items_40 },
{ 12, nss_builtins_types_41, nss_builtins_items_41 },
{ 11, nss_builtins_types_42, nss_builtins_items_42 },
{ 12, nss_builtins_types_43, nss_builtins_items_43 },
{ 11, nss_builtins_types_44, nss_builtins_items_44 },
{ 12, nss_builtins_types_45, nss_builtins_items_45 },
{ 11, nss_builtins_types_46, nss_builtins_items_46 },
{ 12, nss_builtins_types_47, nss_builtins_items_47 },
{ 11, nss_builtins_types_48, nss_builtins_items_48 },
{ 12, nss_builtins_types_49, nss_builtins_items_49 },
{ 11, nss_builtins_types_50, nss_builtins_items_50 },
{ 12, nss_builtins_types_51, nss_builtins_items_51 },
{ 11, nss_builtins_types_52, nss_builtins_items_52 },
{ 12, nss_builtins_types_53, nss_builtins_items_53 },
{ 11, nss_builtins_types_54, nss_builtins_items_54 },
{ 12, nss_builtins_types_55, nss_builtins_items_55 },
{ 11, nss_builtins_types_56, nss_builtins_items_56 },
{ 12, nss_builtins_types_57, nss_builtins_items_57 },
{ 11, nss_builtins_types_58, nss_builtins_items_58 },
{ 12, nss_builtins_types_59, nss_builtins_items_59 },
{ 11, nss_builtins_types_60, nss_builtins_items_60 },
{ 12, nss_builtins_types_61, nss_builtins_items_61 },
{ 11, nss_builtins_types_62, nss_builtins_items_62 },
{ 12, nss_builtins_types_63, nss_builtins_items_63 },
{ 11, nss_builtins_types_64, nss_builtins_items_64 },
{ 12, nss_builtins_types_65, nss_builtins_items_65 },
{ 11, nss_builtins_types_66, nss_builtins_items_66 },
{ 12, nss_builtins_types_67, nss_builtins_items_67 },
{ 11, nss_builtins_types_68, nss_builtins_items_68 },
{ 12, nss_builtins_types_69, nss_builtins_items_69 },
{ 11, nss_builtins_types_70, nss_builtins_items_70 },
{ 12, nss_builtins_types_71, nss_builtins_items_71 },
{ 11, nss_builtins_types_72, nss_builtins_items_72 },
{ 12, nss_builtins_types_73, nss_builtins_items_73 },
{ 11, nss_builtins_types_74, nss_builtins_items_74 },
{ 12, nss_builtins_types_75, nss_builtins_items_75 },
{ 11, nss_builtins_types_76, nss_builtins_items_76 },
{ 12, nss_builtins_types_77, nss_builtins_items_77 },
{ 11, nss_builtins_types_78, nss_builtins_items_78 },
{ 12, nss_builtins_types_79, nss_builtins_items_79 },
{ 11, nss_builtins_types_80, nss_builtins_items_80 },
{ 12, nss_builtins_types_81, nss_builtins_items_81 },
{ 11, nss_builtins_types_82, nss_builtins_items_82 },
{ 12, nss_builtins_types_83, nss_builtins_items_83 },
{ 11, nss_builtins_types_84, nss_builtins_items_84 },
{ 12, nss_builtins_types_85, nss_builtins_items_85 },
{ 11, nss_builtins_types_86, nss_builtins_items_86 },
{ 12, nss_builtins_types_87, nss_builtins_items_87 },
{ 11, nss_builtins_types_88, nss_builtins_items_88 },
{ 12, nss_builtins_types_89, nss_builtins_items_89 },
{ 11, nss_builtins_types_90, nss_builtins_items_90 },
{ 12, nss_builtins_types_91, nss_builtins_items_91 },
{ 11, nss_builtins_types_92, nss_builtins_items_92 },
{ 12, nss_builtins_types_93, nss_builtins_items_93 },
{ 11, nss_builtins_types_94, nss_builtins_items_94 },
{ 12, nss_builtins_types_95, nss_builtins_items_95 },
{ 11, nss_builtins_types_96, nss_builtins_items_96 },
{ 12, nss_builtins_types_97, nss_builtins_items_97 },
{ 11, nss_builtins_types_98, nss_builtins_items_98 },
{ 12, nss_builtins_types_99, nss_builtins_items_99 },
{ 11, nss_builtins_types_100, nss_builtins_items_100 },
{ 12, nss_builtins_types_101, nss_builtins_items_101 },
{ 11, nss_builtins_types_102, nss_builtins_items_102 },
{ 12, nss_builtins_types_103, nss_builtins_items_103 },
{ 11, nss_builtins_types_104, nss_builtins_items_104 },
{ 12, nss_builtins_types_105, nss_builtins_items_105 },
{ 11, nss_builtins_types_106, nss_builtins_items_106 },
{ 12, nss_builtins_types_107, nss_builtins_items_107 },
{ 11, nss_builtins_types_108, nss_builtins_items_108 },
{ 12, nss_builtins_types_109, nss_builtins_items_109 },
{ 11, nss_builtins_types_110, nss_builtins_items_110 },
{ 12, nss_builtins_types_111, nss_builtins_items_111 },
{ 11, nss_builtins_types_112, nss_builtins_items_112 },
{ 12, nss_builtins_types_113, nss_builtins_items_113 },
{ 11, nss_builtins_types_114, nss_builtins_items_114 },
{ 12, nss_builtins_types_115, nss_builtins_items_115 },
{ 11, nss_builtins_types_116, nss_builtins_items_116 },
{ 12, nss_builtins_types_117, nss_builtins_items_117 },
{ 11, nss_builtins_types_118, nss_builtins_items_118 },
{ 12, nss_builtins_types_119, nss_builtins_items_119 },
{ 11, nss_builtins_types_120, nss_builtins_items_120 },
{ 12, nss_builtins_types_121, nss_builtins_items_121 },
{ 11, nss_builtins_types_122, nss_builtins_items_122 },
{ 12, nss_builtins_types_123, nss_builtins_items_123 },
{ 11, nss_builtins_types_124, nss_builtins_items_124 },
{ 12, nss_builtins_types_125, nss_builtins_items_125 },
{ 11, nss_builtins_types_126, nss_builtins_items_126 },
{ 12, nss_builtins_types_127, nss_builtins_items_127 },
{ 11, nss_builtins_types_128, nss_builtins_items_128 },
{ 12, nss_builtins_types_129, nss_builtins_items_129 },
{ 11, nss_builtins_types_130, nss_builtins_items_130 },
{ 12, nss_builtins_types_131, nss_builtins_items_131 },
{ 11, nss_builtins_types_132, nss_builtins_items_132 },
{ 12, nss_builtins_types_133, nss_builtins_items_133 },
{ 11, nss_builtins_types_134, nss_builtins_items_134 },
{ 12, nss_builtins_types_135, nss_builtins_items_135 },
{ 11, nss_builtins_types_136, nss_builtins_items_136 },
{ 12, nss_builtins_types_137, nss_builtins_items_137 },
{ 11, nss_builtins_types_138, nss_builtins_items_138 },
{ 12, nss_builtins_types_139, nss_builtins_items_139 },
{ 11, nss_builtins_types_140, nss_builtins_items_140 },
{ 12, nss_builtins_types_141, nss_builtins_items_141 },
{ 11, nss_builtins_types_142, nss_builtins_items_142 },
{ 12, nss_builtins_types_143, nss_builtins_items_143 },
{ 11, nss_builtins_types_144, nss_builtins_items_144 },
{ 12, nss_builtins_types_145, nss_builtins_items_145 },
{ 11, nss_builtins_types_146, nss_builtins_items_146 },
{ 12, nss_builtins_types_147, nss_builtins_items_147 },
{ 11, nss_builtins_types_148, nss_builtins_items_148 },
{ 12, nss_builtins_types_149, nss_builtins_items_149 },
{ 11, nss_builtins_types_150, nss_builtins_items_150 },
{ 12, nss_builtins_types_151, nss_builtins_items_151 },
{ 11, nss_builtins_types_152, nss_builtins_items_152 },
{ 12, nss_builtins_types_153, nss_builtins_items_153 },
{ 11, nss_builtins_types_154, nss_builtins_items_154 },
{ 12, nss_builtins_types_155, nss_builtins_items_155 },
{ 11, nss_builtins_types_156, nss_builtins_items_156 },
{ 12, nss_builtins_types_157, nss_builtins_items_157 },
{ 11, nss_builtins_types_158, nss_builtins_items_158 },
{ 12, nss_builtins_types_159, nss_builtins_items_159 },
{ 11, nss_builtins_types_160, nss_builtins_items_160 },
{ 12, nss_builtins_types_161, nss_builtins_items_161 },
{ 11, nss_builtins_types_162, nss_builtins_items_162 },
{ 12, nss_builtins_types_163, nss_builtins_items_163 },
{ 11, nss_builtins_types_164, nss_builtins_items_164 },
{ 12, nss_builtins_types_165, nss_builtins_items_165 },
{ 11, nss_builtins_types_166, nss_builtins_items_166 },
{ 12, nss_builtins_types_167, nss_builtins_items_167 },
{ 11, nss_builtins_types_168, nss_builtins_items_168 },
{ 12, nss_builtins_types_169, nss_builtins_items_169 },
{ 11, nss_builtins_types_170, nss_builtins_items_170 },
{ 12, nss_builtins_types_171, nss_builtins_items_171 },
{ 11, nss_builtins_types_172, nss_builtins_items_172 },
{ 12, nss_builtins_types_173, nss_builtins_items_173 },
{ 11, nss_builtins_types_174, nss_builtins_items_174 },
{ 12, nss_builtins_types_175, nss_builtins_items_175 },
{ 11, nss_builtins_types_176, nss_builtins_items_176 },
{ 12, nss_builtins_types_177, nss_builtins_items_177 },
{ 11, nss_builtins_types_178, nss_builtins_items_178 },
{ 12, nss_builtins_types_179, nss_builtins_items_179 },
{ 11, nss_builtins_types_180, nss_builtins_items_180 },
{ 12, nss_builtins_types_181, nss_builtins_items_181 }
{ 5, nss_builtins_types_1, nss_builtins_items_1, {NULL} },
{ 11, nss_builtins_types_2, nss_builtins_items_2, {NULL} },
{ 12, nss_builtins_types_3, nss_builtins_items_3, {NULL} },
{ 11, nss_builtins_types_4, nss_builtins_items_4, {NULL} },
{ 12, nss_builtins_types_5, nss_builtins_items_5, {NULL} },
{ 11, nss_builtins_types_6, nss_builtins_items_6, {NULL} },
{ 12, nss_builtins_types_7, nss_builtins_items_7, {NULL} },
{ 11, nss_builtins_types_8, nss_builtins_items_8, {NULL} },
{ 12, nss_builtins_types_9, nss_builtins_items_9, {NULL} },
{ 11, nss_builtins_types_10, nss_builtins_items_10, {NULL} },
{ 12, nss_builtins_types_11, nss_builtins_items_11, {NULL} },
{ 11, nss_builtins_types_12, nss_builtins_items_12, {NULL} },
{ 12, nss_builtins_types_13, nss_builtins_items_13, {NULL} },
{ 11, nss_builtins_types_14, nss_builtins_items_14, {NULL} },
{ 12, nss_builtins_types_15, nss_builtins_items_15, {NULL} },
{ 11, nss_builtins_types_16, nss_builtins_items_16, {NULL} },
{ 12, nss_builtins_types_17, nss_builtins_items_17, {NULL} },
{ 11, nss_builtins_types_18, nss_builtins_items_18, {NULL} },
{ 12, nss_builtins_types_19, nss_builtins_items_19, {NULL} },
{ 11, nss_builtins_types_20, nss_builtins_items_20, {NULL} },
{ 12, nss_builtins_types_21, nss_builtins_items_21, {NULL} },
{ 11, nss_builtins_types_22, nss_builtins_items_22, {NULL} },
{ 12, nss_builtins_types_23, nss_builtins_items_23, {NULL} },
{ 11, nss_builtins_types_24, nss_builtins_items_24, {NULL} },
{ 12, nss_builtins_types_25, nss_builtins_items_25, {NULL} },
{ 11, nss_builtins_types_26, nss_builtins_items_26, {NULL} },
{ 12, nss_builtins_types_27, nss_builtins_items_27, {NULL} },
{ 11, nss_builtins_types_28, nss_builtins_items_28, {NULL} },
{ 12, nss_builtins_types_29, nss_builtins_items_29, {NULL} },
{ 11, nss_builtins_types_30, nss_builtins_items_30, {NULL} },
{ 12, nss_builtins_types_31, nss_builtins_items_31, {NULL} },
{ 11, nss_builtins_types_32, nss_builtins_items_32, {NULL} },
{ 12, nss_builtins_types_33, nss_builtins_items_33, {NULL} },
{ 11, nss_builtins_types_34, nss_builtins_items_34, {NULL} },
{ 12, nss_builtins_types_35, nss_builtins_items_35, {NULL} },
{ 11, nss_builtins_types_36, nss_builtins_items_36, {NULL} },
{ 12, nss_builtins_types_37, nss_builtins_items_37, {NULL} },
{ 11, nss_builtins_types_38, nss_builtins_items_38, {NULL} },
{ 12, nss_builtins_types_39, nss_builtins_items_39, {NULL} },
{ 11, nss_builtins_types_40, nss_builtins_items_40, {NULL} },
{ 12, nss_builtins_types_41, nss_builtins_items_41, {NULL} },
{ 11, nss_builtins_types_42, nss_builtins_items_42, {NULL} },
{ 12, nss_builtins_types_43, nss_builtins_items_43, {NULL} },
{ 11, nss_builtins_types_44, nss_builtins_items_44, {NULL} },
{ 12, nss_builtins_types_45, nss_builtins_items_45, {NULL} },
{ 11, nss_builtins_types_46, nss_builtins_items_46, {NULL} },
{ 12, nss_builtins_types_47, nss_builtins_items_47, {NULL} },
{ 11, nss_builtins_types_48, nss_builtins_items_48, {NULL} },
{ 12, nss_builtins_types_49, nss_builtins_items_49, {NULL} },
{ 11, nss_builtins_types_50, nss_builtins_items_50, {NULL} },
{ 12, nss_builtins_types_51, nss_builtins_items_51, {NULL} },
{ 11, nss_builtins_types_52, nss_builtins_items_52, {NULL} },
{ 12, nss_builtins_types_53, nss_builtins_items_53, {NULL} },
{ 11, nss_builtins_types_54, nss_builtins_items_54, {NULL} },
{ 12, nss_builtins_types_55, nss_builtins_items_55, {NULL} },
{ 11, nss_builtins_types_56, nss_builtins_items_56, {NULL} },
{ 12, nss_builtins_types_57, nss_builtins_items_57, {NULL} },
{ 11, nss_builtins_types_58, nss_builtins_items_58, {NULL} },
{ 12, nss_builtins_types_59, nss_builtins_items_59, {NULL} },
{ 11, nss_builtins_types_60, nss_builtins_items_60, {NULL} },
{ 12, nss_builtins_types_61, nss_builtins_items_61, {NULL} },
{ 11, nss_builtins_types_62, nss_builtins_items_62, {NULL} },
{ 12, nss_builtins_types_63, nss_builtins_items_63, {NULL} },
{ 11, nss_builtins_types_64, nss_builtins_items_64, {NULL} },
{ 12, nss_builtins_types_65, nss_builtins_items_65, {NULL} },
{ 11, nss_builtins_types_66, nss_builtins_items_66, {NULL} },
{ 12, nss_builtins_types_67, nss_builtins_items_67, {NULL} },
{ 11, nss_builtins_types_68, nss_builtins_items_68, {NULL} },
{ 12, nss_builtins_types_69, nss_builtins_items_69, {NULL} },
{ 11, nss_builtins_types_70, nss_builtins_items_70, {NULL} },
{ 12, nss_builtins_types_71, nss_builtins_items_71, {NULL} },
{ 11, nss_builtins_types_72, nss_builtins_items_72, {NULL} },
{ 12, nss_builtins_types_73, nss_builtins_items_73, {NULL} },
{ 11, nss_builtins_types_74, nss_builtins_items_74, {NULL} },
{ 12, nss_builtins_types_75, nss_builtins_items_75, {NULL} },
{ 11, nss_builtins_types_76, nss_builtins_items_76, {NULL} },
{ 12, nss_builtins_types_77, nss_builtins_items_77, {NULL} },
{ 11, nss_builtins_types_78, nss_builtins_items_78, {NULL} },
{ 12, nss_builtins_types_79, nss_builtins_items_79, {NULL} },
{ 11, nss_builtins_types_80, nss_builtins_items_80, {NULL} },
{ 12, nss_builtins_types_81, nss_builtins_items_81, {NULL} },
{ 11, nss_builtins_types_82, nss_builtins_items_82, {NULL} },
{ 12, nss_builtins_types_83, nss_builtins_items_83, {NULL} },
{ 11, nss_builtins_types_84, nss_builtins_items_84, {NULL} },
{ 12, nss_builtins_types_85, nss_builtins_items_85, {NULL} },
{ 11, nss_builtins_types_86, nss_builtins_items_86, {NULL} },
{ 12, nss_builtins_types_87, nss_builtins_items_87, {NULL} },
{ 11, nss_builtins_types_88, nss_builtins_items_88, {NULL} },
{ 12, nss_builtins_types_89, nss_builtins_items_89, {NULL} },
{ 11, nss_builtins_types_90, nss_builtins_items_90, {NULL} },
{ 12, nss_builtins_types_91, nss_builtins_items_91, {NULL} },
{ 11, nss_builtins_types_92, nss_builtins_items_92, {NULL} },
{ 12, nss_builtins_types_93, nss_builtins_items_93, {NULL} },
{ 11, nss_builtins_types_94, nss_builtins_items_94, {NULL} },
{ 12, nss_builtins_types_95, nss_builtins_items_95, {NULL} },
{ 11, nss_builtins_types_96, nss_builtins_items_96, {NULL} },
{ 12, nss_builtins_types_97, nss_builtins_items_97, {NULL} },
{ 11, nss_builtins_types_98, nss_builtins_items_98, {NULL} },
{ 12, nss_builtins_types_99, nss_builtins_items_99, {NULL} },
{ 11, nss_builtins_types_100, nss_builtins_items_100, {NULL} },
{ 12, nss_builtins_types_101, nss_builtins_items_101, {NULL} },
{ 11, nss_builtins_types_102, nss_builtins_items_102, {NULL} },
{ 12, nss_builtins_types_103, nss_builtins_items_103, {NULL} },
{ 11, nss_builtins_types_104, nss_builtins_items_104, {NULL} },
{ 12, nss_builtins_types_105, nss_builtins_items_105, {NULL} },
{ 11, nss_builtins_types_106, nss_builtins_items_106, {NULL} },
{ 12, nss_builtins_types_107, nss_builtins_items_107, {NULL} },
{ 11, nss_builtins_types_108, nss_builtins_items_108, {NULL} },
{ 12, nss_builtins_types_109, nss_builtins_items_109, {NULL} },
{ 11, nss_builtins_types_110, nss_builtins_items_110, {NULL} },
{ 12, nss_builtins_types_111, nss_builtins_items_111, {NULL} },
{ 11, nss_builtins_types_112, nss_builtins_items_112, {NULL} },
{ 12, nss_builtins_types_113, nss_builtins_items_113, {NULL} },
{ 11, nss_builtins_types_114, nss_builtins_items_114, {NULL} },
{ 12, nss_builtins_types_115, nss_builtins_items_115, {NULL} },
{ 11, nss_builtins_types_116, nss_builtins_items_116, {NULL} },
{ 12, nss_builtins_types_117, nss_builtins_items_117, {NULL} },
{ 11, nss_builtins_types_118, nss_builtins_items_118, {NULL} },
{ 12, nss_builtins_types_119, nss_builtins_items_119, {NULL} },
{ 11, nss_builtins_types_120, nss_builtins_items_120, {NULL} },
{ 12, nss_builtins_types_121, nss_builtins_items_121, {NULL} },
{ 11, nss_builtins_types_122, nss_builtins_items_122, {NULL} },
{ 12, nss_builtins_types_123, nss_builtins_items_123, {NULL} },
{ 11, nss_builtins_types_124, nss_builtins_items_124, {NULL} },
{ 12, nss_builtins_types_125, nss_builtins_items_125, {NULL} },
{ 11, nss_builtins_types_126, nss_builtins_items_126, {NULL} },
{ 12, nss_builtins_types_127, nss_builtins_items_127, {NULL} },
{ 11, nss_builtins_types_128, nss_builtins_items_128, {NULL} },
{ 12, nss_builtins_types_129, nss_builtins_items_129, {NULL} },
{ 11, nss_builtins_types_130, nss_builtins_items_130, {NULL} },
{ 12, nss_builtins_types_131, nss_builtins_items_131, {NULL} },
{ 11, nss_builtins_types_132, nss_builtins_items_132, {NULL} },
{ 12, nss_builtins_types_133, nss_builtins_items_133, {NULL} },
{ 11, nss_builtins_types_134, nss_builtins_items_134, {NULL} },
{ 12, nss_builtins_types_135, nss_builtins_items_135, {NULL} },
{ 11, nss_builtins_types_136, nss_builtins_items_136, {NULL} },
{ 12, nss_builtins_types_137, nss_builtins_items_137, {NULL} },
{ 11, nss_builtins_types_138, nss_builtins_items_138, {NULL} },
{ 12, nss_builtins_types_139, nss_builtins_items_139, {NULL} },
{ 11, nss_builtins_types_140, nss_builtins_items_140, {NULL} },
{ 12, nss_builtins_types_141, nss_builtins_items_141, {NULL} },
{ 11, nss_builtins_types_142, nss_builtins_items_142, {NULL} },
{ 12, nss_builtins_types_143, nss_builtins_items_143, {NULL} },
{ 11, nss_builtins_types_144, nss_builtins_items_144, {NULL} },
{ 12, nss_builtins_types_145, nss_builtins_items_145, {NULL} },
{ 11, nss_builtins_types_146, nss_builtins_items_146, {NULL} },
{ 12, nss_builtins_types_147, nss_builtins_items_147, {NULL} },
{ 11, nss_builtins_types_148, nss_builtins_items_148, {NULL} },
{ 12, nss_builtins_types_149, nss_builtins_items_149, {NULL} },
{ 11, nss_builtins_types_150, nss_builtins_items_150, {NULL} },
{ 12, nss_builtins_types_151, nss_builtins_items_151, {NULL} },
{ 11, nss_builtins_types_152, nss_builtins_items_152, {NULL} },
{ 12, nss_builtins_types_153, nss_builtins_items_153, {NULL} },
{ 11, nss_builtins_types_154, nss_builtins_items_154, {NULL} },
{ 12, nss_builtins_types_155, nss_builtins_items_155, {NULL} },
{ 11, nss_builtins_types_156, nss_builtins_items_156, {NULL} },
{ 12, nss_builtins_types_157, nss_builtins_items_157, {NULL} },
{ 11, nss_builtins_types_158, nss_builtins_items_158, {NULL} },
{ 12, nss_builtins_types_159, nss_builtins_items_159, {NULL} },
{ 11, nss_builtins_types_160, nss_builtins_items_160, {NULL} },
{ 12, nss_builtins_types_161, nss_builtins_items_161, {NULL} },
{ 11, nss_builtins_types_162, nss_builtins_items_162, {NULL} },
{ 12, nss_builtins_types_163, nss_builtins_items_163, {NULL} },
{ 11, nss_builtins_types_164, nss_builtins_items_164, {NULL} },
{ 12, nss_builtins_types_165, nss_builtins_items_165, {NULL} },
{ 11, nss_builtins_types_166, nss_builtins_items_166, {NULL} },
{ 12, nss_builtins_types_167, nss_builtins_items_167, {NULL} },
{ 11, nss_builtins_types_168, nss_builtins_items_168, {NULL} },
{ 12, nss_builtins_types_169, nss_builtins_items_169, {NULL} },
{ 11, nss_builtins_types_170, nss_builtins_items_170, {NULL} },
{ 12, nss_builtins_types_171, nss_builtins_items_171, {NULL} },
{ 11, nss_builtins_types_172, nss_builtins_items_172, {NULL} },
{ 12, nss_builtins_types_173, nss_builtins_items_173, {NULL} },
{ 11, nss_builtins_types_174, nss_builtins_items_174, {NULL} },
{ 12, nss_builtins_types_175, nss_builtins_items_175, {NULL} },
{ 11, nss_builtins_types_176, nss_builtins_items_176, {NULL} },
{ 12, nss_builtins_types_177, nss_builtins_items_177, {NULL} },
{ 11, nss_builtins_types_178, nss_builtins_items_178, {NULL} },
{ 12, nss_builtins_types_179, nss_builtins_items_179, {NULL} },
{ 11, nss_builtins_types_180, nss_builtins_items_180, {NULL} },
{ 12, nss_builtins_types_181, nss_builtins_items_181, {NULL} }
};
PR_IMPLEMENT_DATA(const PRUint32)
#ifdef DEBUG

6
security/nss/lib/ckfw/builtins/certdata.perl
Просмотреть файл

@ -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.6 $ $Date: 2000-09-06 22:23:59 $ $Name: $';
my $cvs_id = '@(#) $RCSfile: certdata.perl,v $ $Revision: 1.7 $ $Date: 2002-02-08 00:10:06 $ $Name: $';
use strict;
my %constants;
@ -259,7 +259,7 @@ for( $i = 0; $i <= $count; $i++ ) {
}
}
print CFILE "\nPR_IMPLEMENT_DATA(const builtinsInternalObject)\n";
print CFILE "\nPR_IMPLEMENT_DATA(builtinsInternalObject)\n";
print CFILE "nss_builtins_data[] = {\n";
for( $i = 0; $i <= $count; $i++ ) {
@ -268,7 +268,7 @@ for( $i = 0; $i <= $count; $i++ ) {
print CFILE "#ifdef DEBUG\n";
}
print CFILE " { $objsize[$i], nss_builtins_types_$i, nss_builtins_items_$i }";
print CFILE " { $objsize[$i], nss_builtins_types_$i, nss_builtins_items_$i, {NULL} }";
if( $i == $count ) {
print CFILE "\n";

14
security/nss/lib/ckfw/builtins/manifest.mn
Просмотреть файл

@ -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.3 $ $Date: 2000-09-06 22:24:00 $ $Name: $"
MANIFEST_CVS_ID = "@(#) $RCSfile: manifest.mn,v $ $Revision: 1.4 $ $Date: 2002-02-08 00:10:07 $ $Name: $"
CORE_DEPTH = ../../../..
@ -39,12 +39,12 @@ MODULE = security
CSRCS = \
anchor.c \
constants.c \
find.c \
instance.c \
object.c \
session.c \
slot.c \
token.c \
bfind.c \
binst.c \
bobject.c \
bsession.c \
bslot.c \
btoken.c \
certdata.c \
$(NULL)

8
security/nss/lib/ckfw/find.c
Просмотреть файл

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: find.c,v $ $Revision: 1.2 $ $Date: 2001-09-20 22:09:45 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: find.c,v $ $Revision: 1.3 $ $Date: 2002-02-08 00:10:00 $ $Name: $";
#endif /* DEBUG */
/*
@ -144,12 +144,14 @@ nssCKFWFindObjects_Create
mdToken = nssCKFWToken_GetMDToken(fwToken);
mdInstance = nssCKFWInstance_GetMDInstance(fwInstance);
#ifdef notdef
arena = nssCKFWSession_GetArena(fwSession, pError);
if( (NSSArena *)NULL == arena ) {
goto loser;
}
#endif
fwFindObjects = nss_ZNEW(arena, NSSCKFWFindObjects);
fwFindObjects = nss_ZNEW(NULL, NSSCKFWFindObjects);
if( (NSSCKFWFindObjects *)NULL == fwFindObjects ) {
*pError = CKR_HOST_MEMORY;
goto loser;
@ -164,7 +166,7 @@ nssCKFWFindObjects_Create
fwFindObjects->fwInstance = fwInstance;
fwFindObjects->mdInstance = mdInstance;
fwFindObjects->mutex = nssCKFWInstance_CreateMutex(fwInstance, arena, pError);
fwFindObjects->mutex = nssCKFWInstance_CreateMutex(fwInstance, NULL, pError);
if( (NSSCKFWMutex *)NULL == fwFindObjects->mutex ) {
goto loser;
}

4
security/nss/lib/ckfw/sessobj.c
Просмотреть файл

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: sessobj.c,v $ $Revision: 1.7 $ $Date: 2001-12-07 01:35:51 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: sessobj.c,v $ $Revision: 1.8 $ $Date: 2002-02-08 00:10:00 $ $Name: $";
#endif /* DEBUG */
/*
@ -1011,7 +1011,7 @@ nssCKMDFindSessionObjects_Create
rv->Next = nss_ckmdFindSessionObjects_Next;
#ifdef DEBUG
if( *pError != nss_ckmdFindSessionObjects_add_pointer(rv) ) {
if( (*pError = nss_ckmdFindSessionObjects_add_pointer(rv)) != CKR_OK ) {
NSSArena_Destroy(arena);
return (NSSCKMDFindObjects *)NULL;
}

6
security/nss/lib/ckfw/wrap.c
Просмотреть файл

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: wrap.c,v $ $Revision: 1.4 $ $Date: 2001-09-20 22:09:47 $ $Name: $";
static const char CVS_ID[] = "@(#) $RCSfile: wrap.c,v $ $Revision: 1.5 $ $Date: 2002-02-08 00:10:00 $ $Name: $";
#endif /* DEBUG */
/*
@ -2513,10 +2513,12 @@ NSSCKFWC_FindObjects
goto loser;
}
#ifdef notdef
arena = nssCKFWSession_GetArena(fwSession, &error);
if( (NSSArena *)NULL == arena ) {
goto loser;
}
#endif
if( (CK_OBJECT_HANDLE_PTR)CK_NULL_PTR == phObject ) {
error = CKR_ARGUMENTS_BAD;
@ -2536,7 +2538,7 @@ NSSCKFWC_FindObjects
for( i = 0; i < ulMaxObjectCount; i++ ) {
NSSCKFWObject *fwObject = nssCKFWFindObjects_Next(fwFindObjects,
arena, &error);
NULL, &error);
if( (NSSCKFWObject *)NULL == fwObject ) {
break;
}