Firefox 3.5.8 fixes some security issues. Bugs fixed are listed at:
http://www.mozilla.org/security/known-vulnerabilities/firefox35.html#firefox3.5.8
Any comments?
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/www/firefox35/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- Makefile 5 Jan 2010 21:26:40 -0000 1.34
+++ Makefile 18 Feb 2010 20:20:26 -0000
@@ -5,7 +5,7 @@
COMMENT= redesign of Mozilla's browser component
-VER= 3.5.7
+VER= 3.5.8
DISTNAME= mozilla-1.9.1
PKGNAME= firefox35-${VER}
SO_VERSION= 22.0
Index: distinfo
===================================================================
RCS file: /usr/cvs/ports/www/firefox35/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 5 Jan 2010 21:26:40 -0000 1.8
+++ distinfo 18 Feb 2010 20:23:27 -0000
@@ -1,5 +1,5 @@
-MD5 (firefox-3.5.7.source.tar.bz2) = gub1aN3qrlLoWqCJJ39dFA==
-RMD160 (firefox-3.5.7.source.tar.bz2) = LpCCddTtft53sosdvZ15BNvgViI=
-SHA1 (firefox-3.5.7.source.tar.bz2) = dgXYmz0+RY23TepNIn3YbQ0Suhs=
-SHA256 (firefox-3.5.7.source.tar.bz2) =
oIdolsZsvwbYu5KWhySKwouZOIBo5LW9KfFjZsOOAYU=
-SIZE (firefox-3.5.7.source.tar.bz2) = 46919155
+MD5 (firefox-3.5.8.source.tar.bz2) = 8g/a32EU6ERWd1zU8POUkg==
+RMD160 (firefox-3.5.8.source.tar.bz2) = l6Q5TYlfwNjnvjTAkOvnVUAQipA=
+SHA1 (firefox-3.5.8.source.tar.bz2) = S/uaJ0ET+57lkMANpp2ZXcUA1Mw=
+SHA256 (firefox-3.5.8.source.tar.bz2) =
m5ubD254P9QYSi8IJko0cN5MvxxBz5z4h6g3PSILtNs=
+SIZE (firefox-3.5.8.source.tar.bz2) = 46954234
Index: patches/patch-configure_in
===================================================================
RCS file: /usr/cvs/ports/www/firefox35/patches/patch-configure_in,v
retrieving revision 1.4
diff -u -r1.4 patch-configure_in
--- patches/patch-configure_in 27 Nov 2009 21:18:52 -0000 1.4
+++ patches/patch-configure_in 18 Feb 2010 20:34:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.4 2009/11/27 21:18:52 naddy Exp $
---- configure.in.orig Mon Nov 2 22:42:44 2009
-+++ configure.in Fri Nov 27 03:01:08 2009
-@@ -1000,7 +1000,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
+--- configure.in.orig Tue Feb 2 18:25:10 2010
++++ configure.in Thu Feb 18 15:26:24 2010
+@@ -998,7 +998,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
@@ -10,7 +10,7 @@
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX)
$(XPCOM_FROZEN_LDOPTS)'
-@@ -2342,7 +2342,7 @@ case "$target" in
+@@ -2340,7 +2340,7 @@ case "$target" in
;;
*-openbsd*)
@@ -19,7 +19,7 @@
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
-@@ -4009,9 +4009,9 @@ AC_CACHE_CHECK(for __thread keyword for TLS variables,
+@@ -4007,9 +4007,9 @@ AC_CACHE_CHECK(for __thread keyword for TLS variables,
[return tlsIsMainThread;],
ac_cv_thread_keyword=yes,
ac_cv_thread_keyword=no)])
Index: patches/patch-extensions_auth_nsAuthGSSAPI_cpp
===================================================================
RCS file:
/usr/cvs/ports/www/firefox35/patches/patch-extensions_auth_nsAuthGSSAPI_cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-extensions_auth_nsAuthGSSAPI_cpp
--- patches/patch-extensions_auth_nsAuthGSSAPI_cpp 21 Jun 2009 01:31:24
-0000 1.1.1.1
+++ patches/patch-extensions_auth_nsAuthGSSAPI_cpp 18 Feb 2010 20:34:11
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-extensions_auth_nsAuthGSSAPI_cpp,v 1.1.1.1 2009/06/21 01:31:24
martynas Exp $
---- extensions/auth/nsAuthGSSAPI.cpp.orig Thu Mar 5 23:31:50 2009
-+++ extensions/auth/nsAuthGSSAPI.cpp Fri Mar 13 17:46:14 2009
-@@ -155,9 +155,8 @@ gssInit()
+--- extensions/auth/nsAuthGSSAPI.cpp.orig Tue Feb 2 18:25:15 2010
++++ extensions/auth/nsAuthGSSAPI.cpp Thu Feb 18 15:26:24 2010
+@@ -159,9 +159,8 @@ gssInit()
};
const char *const verLibNames[] = {
Index: patches/patch-js_src_configure_in
===================================================================
RCS file: /usr/cvs/ports/www/firefox35/patches/patch-js_src_configure_in,v
retrieving revision 1.4
diff -u -r1.4 patch-js_src_configure_in
--- patches/patch-js_src_configure_in 21 Jul 2009 19:53:17 -0000 1.4
+++ patches/patch-js_src_configure_in 18 Feb 2010 20:34:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-js_src_configure_in,v 1.4 2009/07/21 19:53:17 martynas Exp $
---- js/src/configure.in.orig Wed Jul 15 18:34:51 2009
-+++ js/src/configure.in Tue Jul 21 22:47:41 2009
-@@ -906,7 +906,7 @@ HOST_AR='$(AR)'
+--- js/src/configure.in.orig Tue Feb 2 18:25:17 2010
++++ js/src/configure.in Thu Feb 18 15:26:24 2010
+@@ -904,7 +904,7 @@ HOST_AR='$(AR)'
HOST_AR_FLAGS='$(AR_FLAGS)'
MOZ_JS_LIBS='-L$(libdir) -lmozjs'
@@ -10,7 +10,7 @@
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
-@@ -2135,7 +2135,7 @@ case "$target" in
+@@ -2133,7 +2133,7 @@ case "$target" in
;;
*-openbsd*)
@@ -19,7 +19,7 @@
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
-@@ -2467,7 +2467,7 @@ arm*-*)
+@@ -2465,7 +2465,7 @@ arm*-*)
ENABLE_JIT=1
NANOJIT_ARCH=ARM
;;
@@ -28,7 +28,7 @@
ENABLE_JIT=1
NANOJIT_ARCH=Sparc
;;
-@@ -2504,7 +2504,7 @@ darwin*)
+@@ -2502,7 +2502,7 @@ darwin*)
solaris*)
AC_DEFINE(AVMPLUS_UNIX)
;;
Index: patches/patch-nsprpub_config_rules_mk
===================================================================
RCS file: /usr/cvs/ports/www/firefox35/patches/patch-nsprpub_config_rules_mk,v
retrieving revision 1.1
diff -u -r1.1 patch-nsprpub_config_rules_mk
--- patches/patch-nsprpub_config_rules_mk 21 Jun 2009 15:04:16 -0000
1.1
+++ patches/patch-nsprpub_config_rules_mk 18 Feb 2010 20:34:18 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-nsprpub_config_rules_mk,v 1.1 2009/06/21 15:04:16 martynas Exp
$
---- nsprpub/config/rules.mk.orig Wed Jun 17 07:22:05 2009
-+++ nsprpub/config/rules.mk Sun Jun 21 17:51:31 2009
-@@ -219,7 +219,7 @@ ifdef RELEASE_HEADERS
+--- nsprpub/config/rules.mk.orig Tue Feb 2 18:25:27 2010
++++ nsprpub/config/rules.mk Thu Feb 18 15:26:25 2010
+@@ -214,7 +214,7 @@ ifdef RELEASE_HEADERS
$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS)
$(DESTDIR)$(includedir)/$(include_subdir)
endif
ifdef RELEASE_LIBS
Index: patches/patch-nsprpub_pr_src_misc_prdtoa_c
===================================================================
RCS file:
/usr/cvs/ports/www/firefox35/patches/patch-nsprpub_pr_src_misc_prdtoa_c,v
retrieving revision 1.2
diff -u -r1.2 patch-nsprpub_pr_src_misc_prdtoa_c
--- patches/patch-nsprpub_pr_src_misc_prdtoa_c 27 Nov 2009 21:18:52 -0000
1.2
+++ patches/patch-nsprpub_pr_src_misc_prdtoa_c 18 Feb 2010 20:58:00 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-nsprpub_pr_src_misc_prdtoa_c,v 1.2 2009/11/27 21:18:52 naddy
Exp $
---- nsprpub/pr/src/misc/prdtoa.c.orig Wed Nov 25 21:46:23 2009
-+++ nsprpub/pr/src/misc/prdtoa.c Wed Nov 25 21:47:05 2009
+--- nsprpub/pr/src/misc/prdtoa.c.orig Tue Feb 2 18:25:28 2010
++++ nsprpub/pr/src/misc/prdtoa.c Thu Feb 18 15:57:33 2010
@@ -47,42 +47,14 @@
#include "primpl.h"
@@ -44,7 +44,7 @@
/****************************************************************
*
* The author of this software is David M. Gay.
-@@ -102,3310 +74,82 @@ void _PR_CleanupDtoa(void)
+@@ -102,3312 +74,83 @@ void _PR_CleanupDtoa(void)
*
***************************************************************/
@@ -408,7 +408,7 @@
-#define Flt_Rounds 1
-#endif
-#endif /*Flt_Rounds*/
--
+
-#ifdef Honor_FLT_ROUNDS
-#define Rounding rounding
-#undef Check_FLT_ROUNDS
@@ -1708,6 +1708,8 @@
- }
- }
- dig_done:
+- if (nd > 64 * 1024)
+- goto ret0;
- e = 0;
- if (c == 'e' || c == 'E') {
- if (!nd && !nz && !nz0) {
@@ -3391,7 +3393,7 @@
PR_IMPLEMENT(PRStatus)
PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
-@@ -3421,7 +165,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
+@@ -3423,7 +166,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
return rv;
}
@@ -3400,7 +3402,7 @@
if (!result) {
PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
return rv;
-@@ -3436,7 +180,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
+@@ -3438,7 +181,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
}
rv = PR_SUCCESS;
}
@@ -3409,7 +3411,7 @@
return rv;
}
-@@ -3458,9 +202,9 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval
+@@ -3460,9 +203,9 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval
char *num, *nump;
char *bufp = buf;
char *endnum;
@@ -3421,7 +3423,7 @@
/* If anything fails, we store an empty string in 'buf' */
num = (char*)PR_MALLOC(bufsz);
if (num == NULL) {
-@@ -3468,7 +212,7 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval
+@@ -3470,7 +213,7 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval
return;
}
/* XXX Why use mode 1? */
Index: patches/patch-security_nss_lib_ckfw_builtins_certdata_c
===================================================================
RCS file:
/usr/cvs/ports/www/firefox35/patches/patch-security_nss_lib_ckfw_builtins_certdata_c,v
retrieving revision 1.1
diff -u -r1.1 patch-security_nss_lib_ckfw_builtins_certdata_c
--- patches/patch-security_nss_lib_ckfw_builtins_certdata_c 19 Jul 2009
18:38:08 -0000 1.1
+++ patches/patch-security_nss_lib_ckfw_builtins_certdata_c 18 Feb 2010
20:34:09 -0000
@@ -1,30 +1,30 @@
$OpenBSD: patch-security_nss_lib_ckfw_builtins_certdata_c,v 1.1 2009/07/19
18:38:08 martynas Exp $
---- security/nss/lib/ckfw/builtins/certdata.c.orig Thu Jul 16 18:02:46 2009
-+++ security/nss/lib/ckfw/builtins/certdata.c Thu Jul 16 18:09:58 2009
-@@ -900,6 +900,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_280
- static const CK_ATTRIBUTE_TYPE nss_builtins_types_281 [] = {
+--- security/nss/lib/ckfw/builtins/certdata.c.orig Tue Feb 2 18:25:30 2010
++++ security/nss/lib/ckfw/builtins/certdata.c Thu Feb 18 15:33:51 2010
+@@ -984,6 +984,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_308
+ static const CK_ATTRIBUTE_TYPE nss_builtins_types_309 [] = {
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_282 [] = {
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_310 [] = {
+ 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_283 [] = {
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_311 [] = {
+ 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_284 [] = {
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_312 [] = {
+ 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_285 [] = {
++static const CK_ATTRIBUTE_TYPE nss_builtins_types_313 [] = {
+ 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) },
-@@ -18953,6 +18965,332 @@ static const NSSItem nss_builtins_items_281 [] = {
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+@@ -20774,6 +20786,332 @@ static const NSSItem nss_builtins_items_309 [] = {
+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
};
-+static const NSSItem nss_builtins_items_282 [] = {
++static const NSSItem nss_builtins_items_310 [] = {
+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -171,7 +171,7 @@
+"\103"
+, (PRUint32)1857 }
+};
-+static const NSSItem nss_builtins_items_283 [] = {
++static const NSSItem nss_builtins_items_311 [] = {
+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -198,7 +198,7 @@
+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
-+static const NSSItem nss_builtins_items_284 [] = {
++static const NSSItem nss_builtins_items_312 [] = {
+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -323,7 +323,7 @@
+"\322\156\245\033\231\047\200\347\013\251\250\000"
+, (PRUint32)1548 }
+};
-+static const NSSItem nss_builtins_items_285 [] = {
++static const NSSItem nss_builtins_items_313 [] = {
+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -353,22 +353,22 @@
builtinsInternalObject
nss_builtins_data[] = {
-@@ -19239,11 +19577,15 @@ nss_builtins_data[] = {
- { 11, nss_builtins_types_278, nss_builtins_items_278, {NULL} },
- { 13, nss_builtins_types_279, nss_builtins_items_279, {NULL} },
- { 11, nss_builtins_types_280, nss_builtins_items_280, {NULL} },
-- { 13, nss_builtins_types_281, nss_builtins_items_281, {NULL} }
-+ { 13, nss_builtins_types_281, nss_builtins_items_281, {NULL} },
-+ { 11, nss_builtins_types_282, nss_builtins_items_282, {NULL} },
-+ { 13, nss_builtins_types_283, nss_builtins_items_283, {NULL} },
-+ { 11, nss_builtins_types_284, nss_builtins_items_284, {NULL} },
-+ { 13, nss_builtins_types_285, nss_builtins_items_285, {NULL} }
+@@ -21088,11 +21426,15 @@ nss_builtins_data[] = {
+ { 11, nss_builtins_types_306, nss_builtins_items_306, {NULL} },
+ { 13, nss_builtins_types_307, nss_builtins_items_307, {NULL} },
+ { 11, nss_builtins_types_308, nss_builtins_items_308, {NULL} },
+- { 13, nss_builtins_types_309, nss_builtins_items_309, {NULL} }
++ { 13, nss_builtins_types_309, nss_builtins_items_309, {NULL} },
++ { 11, nss_builtins_types_310, nss_builtins_items_310, {NULL} },
++ { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} },
++ { 11, nss_builtins_types_312, nss_builtins_items_312, {NULL} },
++ { 13, nss_builtins_types_313, nss_builtins_items_313, {NULL} }
};
const PRUint32
#ifdef DEBUG
-- nss_builtins_nObjects = 281+1;
-+ nss_builtins_nObjects = 285+1;
+- nss_builtins_nObjects = 309+1;
++ nss_builtins_nObjects = 313+1;
#else
-- nss_builtins_nObjects = 281;
-+ nss_builtins_nObjects = 285;
+- nss_builtins_nObjects = 309;
++ nss_builtins_nObjects = 313;
#endif /* DEBUG */
Index: patches/patch-security_nss_lib_ckfw_builtins_certdata_txt
===================================================================
RCS file:
/usr/cvs/ports/www/firefox35/patches/patch-security_nss_lib_ckfw_builtins_certdata_txt,v
retrieving revision 1.1
diff -u -r1.1 patch-security_nss_lib_ckfw_builtins_certdata_txt
--- patches/patch-security_nss_lib_ckfw_builtins_certdata_txt 19 Jul 2009
18:38:08 -0000 1.1
+++ patches/patch-security_nss_lib_ckfw_builtins_certdata_txt 18 Feb 2010
20:34:09 -0000
@@ -1,12 +1,10 @@
$OpenBSD: patch-security_nss_lib_ckfw_builtins_certdata_txt,v 1.1 2009/07/19
18:38:08 martynas Exp $
---- security/nss/lib/ckfw/builtins/certdata.txt.orig Thu Jul 16 18:02:46 2009
-+++ security/nss/lib/ckfw/builtins/certdata.txt Thu Jul 16 18:07:17 2009
-@@ -19536,3 +19536,349 @@ CKA_TRUST_SERVER_AUTH CK_TRUST
CKT_NETSCAPE_TRUSTED_DE
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+--- security/nss/lib/ckfw/builtins/certdata.txt.orig Tue Feb 2 18:25:30 2010
++++ security/nss/lib/ckfw/builtins/certdata.txt Thu Feb 18 15:26:27 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
@@ -351,3 +349,8 @@
+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
