cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove all patches applying to local copy of nss/nspr, as we now use the

Browse Source 
systemwide ones (which have all those patches). Don't call autoconf in
nsprpub/ while here, and bump PKGNAME to be on the safe side.
This commit is contained in:
landry 2010-06-16 19:07:23 +00:00
parent b4f46ecb94
commit 8b6793ce3d
21 changed files with 2 additions and 4539 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/mozilla-thunderbird/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.92 2010/04/27 20:57:55 landry Exp $
# $OpenBSD: Makefile,v 1.93 2010/06/16 19:07:23 landry Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
@ -7,7 +7,7 @@ COMMENT= e-mail, rss and usenet client based on Mozilla codebase
VER= 3.0.4
DISTNAME= comm-1.9.1
PKGNAME= mozilla-thunderbird-${VER}p0
PKGNAME= mozilla-thunderbird-${VER}p1
# need to be in synch with SO_VERSION in www/seamonkey
# for productivity/sunbird,-lighting and mail/enigmail to work ine
@ -67,7 +67,6 @@ NO_REGRESS= Yes
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/mozilla/build/autoconf \
${WRKSRC}/mozilla/js/src/build/autoconf \
${WRKSRC}/mozilla/nsprpub/build/autoconf \
${WRKSRC}/directory/c-sdk/config/autoconf
AUTOCONF_VERSION= 2.13
@ -126,7 +125,6 @@ pre-configure:
cd ${WRKSRC}/directory/c-sdk && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
cd ${WRKSRC}/mozilla && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
cd ${WRKSRC}/mozilla/js/src && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
cd ${WRKSRC}/mozilla/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
${SUBST_CMD} ${WRKSRC}/mozilla/xpcom/io/nsAppFileLocationProvider.cpp \
${WRKSRC}/mozilla/js/src/xpconnect/shell/Makefile.in \
${WRKSRC}/mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp \

12
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_config_rules_mk
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_config_rules_mk,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/config/rules.mk.orig Wed Mar 17 18:06:09 2010
+++ mozilla/nsprpub/config/rules.mk Tue Mar 30 21:28:30 2010
@@ -214,7 +214,7 @@ ifdef RELEASE_HEADERS
$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
endif
ifdef RELEASE_LIBS
- $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
+ $(NSINSTALL) -t -m 0444 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
endif
+$(LOOP_OVER_DIRS)

16
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_configure_in
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/configure.in.orig Sat Dec 5 02:56:21 2009
+++ mozilla/nsprpub/configure.in Sat Jan 16 16:28:35 2010
@@ -1811,9 +1811,11 @@ mips-sony-newsos*)
AC_DEFINE(OPENBSD)
AC_DEFINE(HAVE_BSD_FLOCK)
AC_DEFINE(HAVE_SOCKLEN_T)
+ AC_DEFINE(_PR_HAVE_GETPROTO_R)
+ AC_DEFINE(_PR_HAVE_GETPROTO_R_INT)
CFLAGS="$CFLAGS -ansi -Wall"
CXXFLAGS="$CXXFLAGS -ansi -Wall"
- DLL_SUFFIX=so.1.0
+ DLL_SUFFIX="so.${SO_VERSION}"
DSO_CFLAGS=-fPIC
MDCPUCFG_H=_openbsd.cfg
PR_MD_CSRCS=openbsd.c

16
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_lib_tests_Makefile_in
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_lib_tests_Makefile_in,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/lib/tests/Makefile.in.orig Sat Dec 5 02:56:21 2009
+++ mozilla/nsprpub/lib/tests/Makefile.in Sat Jan 16 16:28:49 2010
@@ -117,6 +117,12 @@ ifeq (,$(filter-out OpenBSD,$(OS_ARCH)))
endif
endif
+ifeq ($(OS_ARCH), OpenBSD)
+ ifeq ($(USE_PTHREADS),1)
+ EXTRA_LIBS = -lpthread
+ endif
+endif
+
ifeq ($(OS_ARCH), OSF1)
LDOPTS += -rpath $(PWD)/$(dist_libdir) -lpthread
endif

12
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_cfg
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_cfg,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/pr/include/md/_openbsd.cfg.orig Sat Dec 5 02:56:21 2009
+++ mozilla/nsprpub/pr/include/md/_openbsd.cfg Sat Jan 16 16:28:35 2010
@@ -193,7 +193,7 @@
#define PR_BYTES_PER_WORD_LOG2 3
#define PR_BYTES_PER_DWORD_LOG2 3
-#elif defined(__sparc__)
+#elif defined(__sparc__) || defined(__hppa__)
#undef IS_LITTLE_ENDIAN
#define IS_BIG_ENDIAN 1

24
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/pr/include/md/_openbsd.h.orig Sat Dec 5 02:56:21 2009
+++ mozilla/nsprpub/pr/include/md/_openbsd.h Sat Jan 16 16:28:35 2010
@@ -56,6 +56,8 @@
#define _PR_SI_ARCHITECTURE "sparc"
#elif defined(__arm__)
#define _PR_SI_ARCHITECTURE "arm"
+#elif defined(__hppa__)
+#define _PR_SI_ARCHITECTURE "hppa"
#endif
#define PR_DLL_SUFFIX ".so"
@@ -65,7 +67,11 @@
#define _MD_DEFAULT_STACK_SIZE 65536L
#define _MD_MMAP_FLAGS MAP_PRIVATE
+#if defined(__hppa__)
+#define HAVE_STACK_GROWING_UP
+#else
#undef HAVE_STACK_GROWING_UP
+#endif
#define HAVE_DLL
#define USE_DLFCN
#define _PR_HAVE_SOCKADDR_LEN

3434
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c
View File

File diff suppressed because it is too large Load Diff

33
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_src_misc_prinit_c
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/pr/src/misc/prinit.c.orig Sat Dec 5 02:56:21 2009
+++ mozilla/nsprpub/pr/src/misc/prinit.c Sat Jan 16 16:28:35 2010
@@ -414,8 +414,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
_PR_CleanupDtoa();
_PR_CleanupCallOnce();
_PR_ShutdownLinker();
- _PR_CleanupNet();
- _PR_CleanupIO();
/* Release the primordial thread's private data, etc. */
_PR_CleanupThread(me);
@@ -426,6 +424,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
_PR_LogCleanup();
/*
+ * accesses the current thread
+ */
+ _PR_CleanupNet();
+ _PR_CleanupIO();
+
+ /*
* This part should look like the end of _PR_NativeRunThread
* and _PR_UserRunThread.
*/
@@ -437,6 +441,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
PR_DELETE(me->stack);
PR_DELETE(me);
}
+ _PR_MD_SET_CURRENT_THREAD(NULL);
/*
* XXX: We are freeing the heap memory here so that Purify won't

16
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prnetdb_c,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Sat Dec 5 02:56:21 2009
+++ mozilla/nsprpub/pr/src/misc/prnetdb.c Sat Jan 16 16:28:35 2010
@@ -2039,7 +2039,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInfoByName(const
*/
hints.ai_socktype = SOCK_STREAM;
+ LOCK_DNS();
+
rv = GETADDRINFO(hostname, NULL, &hints, &res);
+
+ UNLOCK_DNS();
+
if (rv == 0)
return (PRAddrInfo *) res;

11
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptthread_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptthread_c,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig Sat Dec 5 02:56:21 2009
+++ mozilla/nsprpub/pr/src/pthreads/ptthread.c Sat Jan 16 16:28:35 2010
@@ -51,6 +51,7 @@
#include <unistd.h>
#include <string.h>
#include <signal.h>
+#undef _POSIX_THREAD_PRIORITY_SCHEDULING
#ifdef SYMBIAN
/* In Open C sched_get_priority_min/max do not work properly, so we undefine

13
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_tests_nameshm1_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_pr_tests_nameshm1_c,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/pr/tests/nameshm1.c.orig Sat Dec 5 02:56:21 2009
+++ mozilla/nsprpub/pr/tests/nameshm1.c Sat Jan 16 16:28:36 2010
@@ -598,7 +598,9 @@ int main(int argc, char **argv)
ReadOnlyTest();
if ( failed_already != 0 )
goto Finished;
+#if !defined(__OpenBSD__)
ClientServerTest();
+#endif
}
Finished:

19
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_tests_prpollml_c
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_pr_tests_prpollml_c,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/pr/tests/prpollml.c.orig Sat Dec 5 02:56:21 2009
+++ mozilla/nsprpub/pr/tests/prpollml.c Sat Jan 16 16:28:36 2010
@@ -47,14 +47,10 @@
#include <stdlib.h>
#include <string.h>
-#ifdef SYMBIAN
-#define POLL_DESC_COUNT 128
-#else
-#define POLL_DESC_COUNT 256 /* This should be greater than the
+#define POLL_DESC_COUNT 120 /* This should be greater than the
* STACK_POLL_DESC_COUNT macro in
* ptio.c to cause syspoll_list to
* be created. */
-#endif
static PRPollDesc pd[POLL_DESC_COUNT];

43
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_tests_runtests_sh
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_pr_tests_runtests_sh,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/pr/tests/runtests.sh.orig Sat Dec 5 02:56:21 2009
+++ mozilla/nsprpub/pr/tests/runtests.sh Sat Jan 16 16:28:36 2010
@@ -90,11 +90,10 @@ fi
# Tests not run (but should)
#
-#forktest (failed on IRIX)
+#nameshm1 - runs with ClientServerTest deactivated (idles forever) under OpenBSD
#nbconn - fails on some platforms
-#poll_er - fails on some platforms? limited use?
#prpoll - the bad-FD test needs to be moved to a different test
-#sleep - specific to OS/2
+#sema,semaerr and semaping - idles forever under OpenBSD (semaphore/thread)
LOGFILE=${NSPR_TEST_LOGFILE:-$NULL_DEVICE}
@@ -124,6 +123,7 @@ exit
fdcach
fileio
foreign
+forktest
formattm
fsync
gethost
@@ -168,6 +168,7 @@ perf
pipeping
pipeping2
pipeself
+poll_er
poll_nm
poll_to
pollable
@@ -184,9 +185,6 @@ selct_er
selct_nm
selct_to
selintr
-sema
-semaerr
-semaping
sendzlf
server_test
servr_kk

59
mail/mozilla-thunderbird/patches/patch-mozilla_nsprpub_pr_tests_socket_c
View File

@ -1,59 +0,0 @@
$OpenBSD: patch-mozilla_nsprpub_pr_tests_socket_c,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/nsprpub/pr/tests/socket.c.orig Sat Dec 5 02:56:21 2009
+++ mozilla/nsprpub/pr/tests/socket.c Sat Jan 16 16:28:36 2010
@@ -2234,6 +2234,7 @@ int main(int argc, char **argv)
/*
* client-server test, Ipv6-Ipv4
*/
+ #if !defined(__OpenBSD__)
client_domain = PR_AF_INET6;
printf("TCP Client/Server Test - IPv6/Ipv4\n");
if (TCP_Socket_Client_Server_Test() < 0) {
@@ -2241,9 +2242,11 @@ int main(int argc, char **argv)
goto done;
} else
printf("TCP_Socket_Client_Server_Test Passed\n");
+ #endif
/*
* client-server test, Ipv4-Ipv6
*/
+ #if !defined(__OpenBSD__)
client_domain = PR_AF_INET;
server_domain = PR_AF_INET6;
printf("TCP Client/Server Test - IPv4/Ipv6\n");
@@ -2252,6 +2255,7 @@ int main(int argc, char **argv)
goto done;
} else
printf("TCP_Socket_Client_Server_Test Passed\n");
+ #endif
/*
* client-server test, Ipv6-Ipv6
*/
@@ -2281,6 +2285,7 @@ int main(int argc, char **argv)
/*
* run client-server test with UDP, IPv6/IPv4
*/
+ #if !defined(__OpenBSD__)
printf("UDP Client/Server Test - IPv6/Ipv4\n");
client_domain = PR_AF_INET6;
server_domain = PR_AF_INET;
@@ -2289,9 +2294,11 @@ int main(int argc, char **argv)
goto done;
} else
printf("UDP_Socket_Client_Server_Test Passed\n");
+ #endif
/*
* run client-server test with UDP,IPv4-IPv6
*/
+ #if !defined(__OpenBSD__)
printf("UDP Client/Server Test - IPv4/Ipv6\n");
client_domain = PR_AF_INET;
server_domain = PR_AF_INET6;
@@ -2300,6 +2307,7 @@ int main(int argc, char **argv)
goto done;
} else
printf("UDP_Socket_Client_Server_Test Passed\n");
+ #endif
/*
* run client-server test with UDP,IPv6-IPv6
*/

17
mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_cmd_platlibs_mk
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-mozilla_security_nss_cmd_platlibs_mk,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/security/nss/cmd/platlibs.mk.orig Wed Mar 17 18:06:11 2010
+++ mozilla/security/nss/cmd/platlibs.mk Tue Mar 30 21:28:32 2010
@@ -179,10 +179,11 @@ endif
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
- $(SQLITE) \
-L$(NSSUTIL_LIB_DIR) \
- -lnssutil3 \
-L$(NSPR_LIB_DIR) \
+ -L$(LOCALBASE)/lib \
+ $(SQLITE) \
+ -lnssutil3 \
-lplc4 \
-lplds4 \
-lnspr4 \

374
mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c
View File

@ -1,374 +0,0 @@
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/security/nss/lib/ckfw/builtins/certdata.c.orig Wed Mar 17 18:06:11 2010
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.c Tue Mar 30 21:48:28 2010
@@ -1020,6 +1020,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_320
static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = {
CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_322 [] = {
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_323 [] = {
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_324 [] = {
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_325 [] = {
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
+};
#ifdef DEBUG
static const NSSItem nss_builtins_items_0 [] = {
{ (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
@@ -21537,6 +21549,332 @@ static const NSSItem nss_builtins_items_321 [] = {
{ (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
};
+static const NSSItem nss_builtins_items_322 [] = {
+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)"CAcert.org Class 1 Certification Authority", (PRUint32)43 },
+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+ { (void *)"0", (PRUint32)2 },
+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+ { (void *)"\002\001\000"
+, (PRUint32)3 },
+ { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063"
+"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060"
+"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016"
+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
+"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
+"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007"
+"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002"
+"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011"
+"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315"
+"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230"
+"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272"
+"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016"
+"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052"
+"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262"
+"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140"
+"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150"
+"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273"
+"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022"
+"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234"
+"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334"
+"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070"
+"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232"
+"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044"
+"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355"
+"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252"
+"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352"
+"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276"
+"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306"
+"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320"
+"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167"
+"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335"
+"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324"
+"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246"
+"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106"
+"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272"
+"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334"
+"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304"
+"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060"
+"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265"
+"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071"
+"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230"
+"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260"
+"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016"
+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
+"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001"
+"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037"
+"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160"
+"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157"
+"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006"
+"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164"
+"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060"
+"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045"
+"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162"
+"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077"
+"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102"
+"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165"
+"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164"
+"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040"
+"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167"
+"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006"
+"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001"
+"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201"
+"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275"
+"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234"
+"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323"
+"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073"
+"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140"
+"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353"
+"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160"
+"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334"
+"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231"
+"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116"
+"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145"
+"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031"
+"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363"
+"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330"
+"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367"
+"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260"
+"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223"
+"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335"
+"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026"
+"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005"
+"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361"
+"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371"
+"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246"
+"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206"
+"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153"
+"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344"
+"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143"
+"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362"
+"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226"
+"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175"
+"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305"
+"\103"
+, (PRUint32)1857 }
+};
+static const NSSItem nss_builtins_items_323 [] = {
+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)"CAcert.org Class 1 Certification Authority", (PRUint32)43 },
+ { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106"
+"\166\316\217\063"
+, (PRUint32)20 },
+ { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153"
+, (PRUint32)16 },
+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+ { (void *)"\002\001\000"
+, (PRUint32)3 },
+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_324 [] = {
+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)"CAcert.org Class 3 Certification Authority", (PRUint32)43 },
+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+ { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143"
+"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004"
+"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101"
+"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004"
+"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040"
+"\063\040\122\157\157\164"
+, (PRUint32)86 },
+ { (void *)"0", (PRUint32)2 },
+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
+ { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001"
+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065"
+"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060"
+"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022"
+"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156"
+"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164"
+"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157"
+"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143"
+"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164"
+"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
+"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
+"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335"
+"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175"
+"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163"
+"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144"
+"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001"
+"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171"
+"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313"
+"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011"
+"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353"
+"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277"
+"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331"
+"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205"
+"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073"
+"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161"
+"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371"
+"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047"
+"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252"
+"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102"
+"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064"
+"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133"
+"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242"
+"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137"
+"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325"
+"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150"
+"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230"
+"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140"
+"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347"
+"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321"
+"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206"
+"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257"
+"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164"
+"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373"
+"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003"
+"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006"
+"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006"
+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072"
+"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162"
+"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034"
+"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162"
+"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003"
+"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001"
+"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002"
+"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101"
+"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160"
+"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206"
+"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241"
+"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072"
+"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135"
+"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253"
+"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364"
+"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172"
+"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302"
+"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214"
+"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074"
+"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154"
+"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025"
+"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352"
+"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231"
+"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213"
+"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325"
+"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242"
+"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214"
+"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027"
+"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057"
+"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224"
+"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134"
+"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356"
+"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005"
+"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355"
+"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143"
+"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123"
+"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243"
+"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005"
+"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156"
+"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317"
+"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360"
+"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101"
+"\322\156\245\033\231\047\200\347\013\251\250\000"
+, (PRUint32)1548 }
+};
+static const NSSItem nss_builtins_items_325 [] = {
+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)"CAcert.org Class 3 Certification Authority", (PRUint32)43 },
+ { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304"
+"\030\116\052\055"
+, (PRUint32)20 },
+ { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266"
+, (PRUint32)16 },
+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
builtinsInternalObject
nss_builtins_data[] = {
@@ -21863,11 +22201,15 @@ nss_builtins_data[] = {
{ 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} },
{ 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} },
{ 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} },
- { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }
+ { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} },
+ { 11, nss_builtins_types_322, nss_builtins_items_322, {NULL} },
+ { 13, nss_builtins_types_323, nss_builtins_items_323, {NULL} },
+ { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
+ { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }
};
const PRUint32
#ifdef DEBUG
- nss_builtins_nObjects = 321+1;
+ nss_builtins_nObjects = 325+1;
#else
- nss_builtins_nObjects = 321;
+ nss_builtins_nObjects = 325;
#endif /* DEBUG */

356
mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt
View File

@ -1,356 +0,0 @@
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/security/nss/lib/ckfw/builtins/certdata.txt.orig Wed Mar 17 18:06:11 2010
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.txt Tue Mar 30 21:28:32 2010
@@ -19538,6 +19538,352 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNK
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
#
+# Certificate "CAcert.org Class 1 Certification Authority"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CAcert.org Class 1 Certification Authority"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063
+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060
+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016
+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007
+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002
+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011
+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315
+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230
+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272
+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016
+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052
+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262
+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140
+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150
+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273
+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022
+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234
+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334
+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070
+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232
+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044
+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355
+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252
+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352
+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276
+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306
+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320
+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167
+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335
+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324
+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246
+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106
+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272
+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334
+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304
+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060
+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265
+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071
+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230
+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260
+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016
+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001
+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037
+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160
+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157
+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006
+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164
+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060
+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045
+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077
+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102
+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165
+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164
+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040
+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167
+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006
+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001
+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201
+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275
+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234
+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323
+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073
+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140
+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353
+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160
+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334
+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231
+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116
+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145
+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031
+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363
+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330
+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367
+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260
+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223
+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335
+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026
+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005
+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361
+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371
+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246
+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206
+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153
+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344
+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143
+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362
+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226
+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175
+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305
+\103
+END
+
+# Trust for Certificate "CAcert.org Class 1 Certification Authority"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CAcert.org Class 1 Certification Authority"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106
+\166\316\217\063
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "CAcert.org Class 3 Certification Authority"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CAcert.org Class 3 Certification Authority"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143
+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004
+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101
+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004
+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040
+\063\040\122\157\157\164
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001
+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065
+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060
+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022
+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156
+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164
+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157
+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143
+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164
+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335
+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175
+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163
+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144
+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001
+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171
+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313
+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011
+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353
+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277
+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331
+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205
+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073
+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161
+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371
+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047
+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252
+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102
+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064
+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133
+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242
+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137
+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325
+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150
+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230
+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140
+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347
+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321
+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206
+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257
+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164
+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373
+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003
+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006
+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006
+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162
+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034
+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162
+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003
+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001
+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002
+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101
+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160
+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206
+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241
+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072
+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135
+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253
+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364
+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172
+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302
+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214
+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074
+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154
+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025
+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352
+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231
+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213
+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325
+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242
+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214
+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027
+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057
+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224
+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134
+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356
+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005
+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355
+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143
+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123
+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243
+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005
+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156
+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317
+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360
+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101
+\322\156\245\033\231\047\200\347\013\251\250\000
+END
+
+# Trust for Certificate "CAcert.org Class 3 Certification Authority"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CAcert.org Class 3 Certification Authority"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304
+\030\116\052\055
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
# Certificate "ePKI Root Certification Authority"
#
CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE

12
mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_freebl_blapi_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_security_nss_lib_freebl_blapi_h,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/security/nss/lib/freebl/blapi.h.orig Sat Dec 5 02:56:24 2009
+++ mozilla/security/nss/lib/freebl/blapi.h Sat Jan 16 16:28:37 2010
@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo
*/
extern void SHA1_Begin(SHA1Context *cx);
+#define SHA1_Update NSS_SHA1_Update
+
/*
** Update the SHA-1 hash function with more data.
** "cx" the context

29
mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/security/nss/lib/freebl/unix_rand.c.orig Sat Dec 5 02:56:24 2009
+++ mozilla/security/nss/lib/freebl/unix_rand.c Sat Jan 16 16:28:37 2010
@@ -849,7 +849,6 @@ safe_pclose(FILE *fp)
/* Fork netstat to collect its output by default. Do not unset this unless
* another source of entropy is available
*/
-#define DO_NETSTAT 1
void RNG_SystemInfoForRNG(void)
{
@@ -916,7 +915,7 @@ void RNG_SystemInfoForRNG(void)
GiveSystemInfo();
/* grab some data from system's PRNG before any other files. */
- bytes = RNG_FileUpdate("/dev/urandom", SYSTEM_RNG_SEED_COUNT);
+ bytes = RNG_FileUpdate(RAND_DEV, SYSTEM_RNG_SEED_COUNT);
/* If the user points us to a random file, pass it through the rng */
randfile = getenv("NSRANDFILE");
@@ -1159,7 +1158,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
size_t fileBytes = 0;
unsigned char *buffer = dest;
- file = fopen("/dev/urandom", "r");
+ file = fopen(RAND_DEV, "r");
if (file == NULL) {
return rng_systemFromNoise(dest, maxLen);
}

27
mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_softoken_config_mk
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-mozilla_security_nss_lib_softoken_config_mk,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/security/nss/lib/softoken/config.mk.orig Sat Dec 5 02:56:24 2009
+++ mozilla/security/nss/lib/softoken/config.mk Sat Jan 16 16:28:37 2010
@@ -56,9 +56,10 @@ ifdef NS_USE_GCC
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
-L$(NSSUTIL_LIB_DIR) \
+ -L$(NSPR_LIB_DIR) \
+ -L$(LOCALBASE)/lib \
-lnssutil3 \
-lsqlite3 \
- -L$(NSPR_LIB_DIR) \
-lplc4 \
-lplds4 \
-lnspr4 \
@@ -82,9 +83,10 @@ else
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
-L$(NSSUTIL_LIB_DIR) \
+ -L$(NSPR_LIB_DIR) \
+ -L$(LOCALBASE)/lib \
-lnssutil3 \
-lsqlite3 \
- -L$(NSPR_LIB_DIR) \
-lplc4 \
-lplds4 \
-lnspr4 \

12
mail/mozilla-thunderbird/patches/patch-mozilla_security_nss_lib_softoken_fipstokn_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_security_nss_lib_softoken_fipstokn_c,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/security/nss/lib/softoken/fipstokn.c.orig Sat Dec 5 02:56:24 2009
+++ mozilla/security/nss/lib/softoken/fipstokn.c Sat Jan 16 16:28:37 2010
@@ -73,7 +73,7 @@
#ifdef LINUX
#include <pthread.h>
#include <dlfcn.h>
-#define LIBAUDIT_NAME "libaudit.so.0"
+#define LIBAUDIT_NAME "libaudit.so"
#ifndef AUDIT_CRYPTO_TEST_USER
#define AUDIT_CRYPTO_TEST_USER 2400 /* Crypto test results */
#define AUDIT_CRYPTO_PARAM_CHANGE_USER 2401 /* Crypto attribute change */