LSB: add nspr and nss to pass LSB library check

new file mode 100644
index 0000000..44810b6
@@ -0,0 +1,45 @@
+import from oe, rev 199effd4c7b1b62bc133a577e42d7043ee7202e7
+
+Signed-off-by: Kang Kai <[email protected]>
+
+--- nsprpub/configure.in
++++ nsprpub/configure.in
+@@ -57,7 +57,7 @@
+ USE_USER_PTHREADS=
+ USE_NSPR_THREADS=
+ USE_N32=
+-USE_64=
++USE_64=maybe
+ USE_CPLUS=
+ USE_IPV6=
+ USE_MDUPDATE=
+@@ -222,11 +222,26 @@
+     fi ])
+ 
+ AC_ARG_ENABLE(64bit,
+-    [  --enable-64bit          Enable 64-bit support (on certain platforms)],
+-    [ if test "$enableval" = "yes"; then
+-	    USE_64=1
++    [  --disable-64bit         Disable 64-bit support (on 64-bit platforms)],
++    [ if test "$enableval" = "no"; then
++	    USE_64=
++      else
++	    USE_64=1
+       fi ])
+ 
++if test "${USE_64}"; then
++    AC_MSG_CHECKING(for 64-bit OS)
++    AC_TRY_COMPILE([],[int assert[(sizeof(long) == 8) ? 1: -1]],
++        result="yes", result="no")
++    AC_MSG_RESULT("$result")
++    if test "$result" = "no" && test "$USE_64" = 1; then
++        AC_MSG_ERROR([Can't --enable-64bit on non 64-bit platforms])
++    fi
++    if test "$result" = "yes"; then
++        USE_64=1
++    fi
++fi
++
+ AC_ARG_ENABLE(mdupdate,
+     [  --enable-mdupdate       Enable use of certain compilers' mdupdate feature],
+     [ if test "$enableval" = "yes"; then

new file mode 100644
index 0000000..9df8080
@@ -0,0 +1,37 @@
+import from oe, rev 199effd4c7b1b62bc133a577e42d7043ee7202e7
+
+Signed-off-by: Kang Kai <[email protected]>
+
+--- nsprpub/config/Makefile.in
++++ nsprpub/config/Makefile.in
+@@ -158,3 +158,7 @@
+ install:: nspr.m4
+ 	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
+ 	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal
++
++install:: nspr.pc
++	$(NSINSTALL) -D $(DESTDIR)$(libdir)/pkgconfig
++	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(libdir)/pkgconfig
+--- nsprpub/config/nspr.pc.in
++++ nsprpub/config/nspr.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSPR
++Description: The Netscape Portable Runtime
++Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
++Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ @OS_LIBS@
++Cflags: -I@includedir@
+--- nsprpub/configure.in
++++ nsprpub/configure.in
+@@ -2766,6 +2766,7 @@
+ config/nsprincl.mk
+ config/nsprincl.sh
+ config/nspr-config
++config/nspr.pc
+ lib/Makefile 
+ lib/ds/Makefile 
+ lib/libc/Makefile 

233 lines not on this page · raw message

50 lines not on this page · raw message

new file mode 100644
index 0000000..0476794
@@ -0,0 +1,29 @@
+SUMMARY = "Netscape Portable Runtime"
+
+DESCRIPTION = "\
+NSPR provides platform independence for non-GUI operating system \
+facilities. These facilities include threads, thread synchronization, \
+normal file and network I/O, interval timing and calendar time, basic \
+memory management (malloc and free) and shared library linking."
+
+HOMEPAGE = "https://www.mozilla.org/projects/nspr"
+LICENSE = "MPL1.1 | GPLv2+ | LGPLv2.1+" 
+
+S = "${WORKDIR}/nspr-${PV}/mozilla/nsprpub"
+
+inherit native autotools
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/nspr-${PV}"
+
+do_compile() {
+	# Build 'now' and 'nsinstall' only.
+	oe_runmake -C config now nsinstall
+}
+
+NATIVE_INSTALL_WORKS = "1"
+
+do_install() {
+	install -d ${D}${bindir}/nspr-${PV}
+	install -m 0755 config/now ${D}${bindir}/nspr-${PV}
+	install -m 0755 config/nsinstall ${D}${bindir}/nspr-${PV}
+}

new file mode 100644
index 0000000..0cfadcb
@@ -0,0 +1,16 @@
+require nspr-tools-native.inc
+
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://${S}/pkg/solaris/common_files/copyright;md5=555c634e9953bed3492dd5e6d90cd973"
+
+SRC_URI = "\
+	http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz;name=archive \
+	file://30_config_64bits.dpatch;apply=yes \
+	file://30_pkgconfig.dpatch;apply=yes \
+	file://81_sonames.dpatch;apply=yes \
+	file://unbreak-build.diff \
+	"
+
+SRC_URI[archive.md5sum] = "97e30989a56ab813453b71261849c200"
+SRC_URI[archive.sha256sum] = "eb9459c31d43d1000fb1304f1e0cedab0bdac3c54c71988259c1ac10c1fe16a3"

44 lines not on this page · raw message

new file mode 100644
index 0000000..5fe0cfb
@@ -0,0 +1,17 @@
+require nspr.inc
+
+LIC_FILES_CHKSUM = "file://${S}/Makefile.in;beginline=4;endline=38;md5=c2b512182a334e1bfa1edc4d1c84a298"
+
+SRC_URI = "\
+	http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz;name=archive \
+	file://30_config_64bits.dpatch;apply=yes \
+	file://30_pkgconfig.dpatch;apply=yes \
+	file://81_sonames.dpatch;apply=yes \
+	file://unbreak-build.diff \
+	"
+
+SRC_URI[archive.md5sum] = "7c6e75a0867ce2b9ec62e399a908b5ac"
+SRC_URI[archive.sha256sum] = "58782b11423359f2a247f0217aab6fe041f32984aac1f411da6d43bd34cfd0db"
+
+FILES_${PN} = "${libdir}/lib*"
+FILES_${PN}-dev += "${bindir}/nspr-config"

new file mode 100644
index 0000000..43be028
@@ -0,0 +1,6390 @@
+import from oe, rev c35a432051fe5e4f42c8b35845af5eddf00ddeb3
+
+Signed-off-by: Kang Kai <[email protected]>
+
+diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.c b/mozilla/security/nss/lib/ckfw/builtins/certdata.c
+index 2c6fdab..52b78ad 100644
+--- a/mozilla/security/nss/lib/ckfw/builtins/certdata.c
++++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.c
+@@ -35,7 +35,7 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ #ifdef DEBUG
+-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $";
++static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $";
+ #endif /* DEBUG */
+ 
+ #ifndef BUILTINS_H
+@@ -960,66 +960,6 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_300 [] = {
+ static const CK_ATTRIBUTE_TYPE nss_builtins_types_301 [] = {
+  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_302 [] = {
+- 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_303 [] = {
+- 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_304 [] = {
+- 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_305 [] = {
+- 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_306 [] = {
+- 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_307 [] = {
+- 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_308 [] = {
+- 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_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_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_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_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_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
+-};
+-static const CK_ATTRIBUTE_TYPE nss_builtins_types_314 [] = {
+- 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_315 [] = {
+- 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_316 [] = {
+- 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_317 [] = {
+- 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_318 [] = {
+- 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_319 [] = {
+- 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_320 [] = {
+- 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_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
+-};
+ #ifdef DEBUG
+ static const NSSItem nss_builtins_items_0 [] = {
+   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+@@ -1028,7 +968,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.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $", (PRUint32)160 }
++  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67 $ $Date: 2010/04/08 14:28:58 $", (PRUint32)160 }
+ };
+ #endif /* DEBUG */
+ static const NSSItem nss_builtins_items_1 [] = {
+@@ -1043,98 +983,6 @@ static const NSSItem nss_builtins_items_2 [] = {
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+-  { (void *)"Verisign/RSA Secure Server CA", (PRUint32)30 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+-"\040\060\036\006\003\125\004\012\023\027\122\123\101\040\104\141"
+-"\164\141\040\123\145\143\165\162\151\164\171\054\040\111\156\143"
+-"\056\061\056\060\054\006\003\125\004\013\023\045\123\145\143\165"
+-"\162\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146"
+-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
+-"\171"
+-, (PRUint32)97 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+-"\040\060\036\006\003\125\004\012\023\027\122\123\101\040\104\141"
+-"\164\141\040\123\145\143\165\162\151\164\171\054\040\111\156\143"
+-"\056\061\056\060\054\006\003\125\004\013\023\045\123\145\143\165"
+-"\162\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146"
+-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
+-"\171"
+-, (PRUint32)97 },
+-  { (void *)"\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136"
+-"\335\300"
+-, (PRUint32)18 },
+-  { (void *)"\060\202\002\064\060\202\001\241\002\020\002\255\146\176\116\105"
+-"\376\136\127\157\074\230\031\136\335\300\060\015\006\011\052\206"
+-"\110\206\367\015\001\001\002\005\000\060\137\061\013\060\011\006"
+-"\003\125\004\006\023\002\125\123\061\040\060\036\006\003\125\004"
+-"\012\023\027\122\123\101\040\104\141\164\141\040\123\145\143\165"
+-"\162\151\164\171\054\040\111\156\143\056\061\056\060\054\006\003"
+-"\125\004\013\023\045\123\145\143\165\162\145\040\123\145\162\166"
+-"\145\162\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
+-"\040\101\165\164\150\157\162\151\164\171\060\036\027\015\071\064"
+-"\061\061\060\071\060\060\060\060\060\060\132\027\015\061\060\060"
+-"\061\060\067\062\063\065\071\065\071\132\060\137\061\013\060\011"
+-"\006\003\125\004\006\023\002\125\123\061\040\060\036\006\003\125"
+-"\004\012\023\027\122\123\101\040\104\141\164\141\040\123\145\143"
+-"\165\162\151\164\171\054\040\111\156\143\056\061\056\060\054\006"
+-"\003\125\004\013\023\045\123\145\143\165\162\145\040\123\145\162"
+-"\166\145\162\040\103\145\162\164\151\146\151\143\141\164\151\157"
+-"\156\040\101\165\164\150\157\162\151\164\171\060\201\233\060\015"
+-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\211"
+-"\000\060\201\205\002\176\000\222\316\172\301\256\203\076\132\252"
+-"\211\203\127\254\045\001\166\014\255\256\216\054\067\316\353\065"
+-"\170\144\124\003\345\204\100\121\311\277\217\010\342\212\202\010"
+-"\322\026\206\067\125\351\261\041\002\255\166\150\201\232\005\242"
+-"\113\311\113\045\146\042\126\154\210\007\217\367\201\131\155\204"
+-"\007\145\160\023\161\166\076\233\167\114\343\120\211\126\230\110"
+-"\271\035\247\051\032\023\056\112\021\131\234\036\025\325\111\124"
+-"\054\163\072\151\202\261\227\071\234\155\160\147\110\345\335\055"
+-"\326\310\036\173\002\003\001\000\001\060\015\006\011\052\206\110"
+-"\206\367\015\001\001\002\005\000\003\176\000\145\335\176\341\262"
+-"\354\260\342\072\340\354\161\106\232\031\021\270\323\307\240\264"
+-"\003\100\046\002\076\011\234\341\022\263\321\132\366\067\245\267"
+-"\141\003\266\133\026\151\073\306\104\010\014\210\123\014\153\227"
+-"\111\307\076\065\334\154\271\273\252\337\134\273\072\057\223\140"
+-"\266\251\113\115\362\040\367\315\137\177\144\173\216\334\000\134"
+-"\327\372\167\312\071\026\131\157\016\352\323\265\203\177\115\115"
+-"\102\126\166\264\311\137\004\370\070\370\353\322\137\165\137\315"
+-"\173\374\345\216\200\174\374\120"
+-, (PRUint32)568 }
+-};
+-static const NSSItem nss_builtins_items_3 [] = {
+-  { (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 *)"Verisign/RSA Secure Server CA", (PRUint32)30 },
+-  { (void *)"\104\143\305\061\327\314\301\000\147\224\141\053\266\126\323\277"
+-"\202\127\204\157"
+-, (PRUint32)20 },
+-  { (void *)"\164\173\202\003\103\360\000\236\153\263\354\107\277\205\245\223"
+-, (PRUint32)16 },
+-  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+-"\040\060\036\006\003\125\004\012\023\027\122\123\101\040\104\141"
+-"\164\141\040\123\145\143\165\162\151\164\171\054\040\111\156\143"
+-"\056\061\056\060\054\006\003\125\004\013\023\045\123\145\143\165"
+-"\162\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146"
+-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
+-"\171"
+-, (PRUint32)97 },
+-  { (void *)"\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136"
+-"\335\300"
+-, (PRUint32)18 },
+-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }
+-};
+-static const NSSItem nss_builtins_items_4 [] = {
+-  { (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 *)"GTE CyberTrust Root CA", (PRUint32)23 },
+   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+   { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+@@ -1186,7 +1034,7 @@ static const NSSItem nss_builtins_items_4 [] = {
+ "\264\172\341\345\132\037\204\060\234\323\237\245\045\330"
+ , (PRUint32)510 }
+ };
+-static const NSSItem nss_builtins_items_5 [] = {
++static const NSSItem nss_builtins_items_3 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -1205,12 +1053,12 @@ static const NSSItem nss_builtins_items_5 [] = {
+ , (PRUint32)71 },
+   { (void *)"\002\002\001\243"
+ , (PRUint32)4 },
+-  { (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_true, (PRUint32)sizeof(CK_BBOOL) }
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_6 [] = {
++static const NSSItem nss_builtins_items_4 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -1278,7 +1126,7 @@ static const NSSItem nss_builtins_items_6 [] = {
+ "\037\042\265\315\225\255\272\247\314\371\253\013\172\177"
+ , (PRUint32)606 }
+ };
+-static const NSSItem nss_builtins_items_7 [] = {
++static const NSSItem nss_builtins_items_5 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -1303,258 +1151,9 @@ static const NSSItem nss_builtins_items_7 [] = {
+   { (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_true, (PRUint32)sizeof(CK_BBOOL) }
+-};
+-static const NSSItem nss_builtins_items_8 [] = {
+-  { (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 *)"Thawte Personal Basic CA", (PRUint32)25 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\201\313\061\013\060\011\006\003\125\004\006\023\002\132\101"
+-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+-"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167"
+-"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151"
+-"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015"
+-"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141"
+-"\163\151\143\100\164\150\141\167\164\145\056\143\157\155"
+-, (PRUint32)206 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\201\313\061\013\060\011\006\003\125\004\006\023\002\132\101"
+-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+-"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167"
+-"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151"
+-"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015"
+-"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141"
+-"\163\151\143\100\164\150\141\167\164\145\056\143\157\155"
+-, (PRUint32)206 },
+-  { (void *)"\002\001\000"
+-, (PRUint32)3 },
+-  { (void *)"\060\202\003\041\060\202\002\212\240\003\002\001\002\002\001\000"
+-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+-"\201\313\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
+-"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162"
+-"\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023"
+-"\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006\003"
+-"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163"
+-"\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013\023"
+-"\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123"
+-"\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156"
+-"\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167\164"
+-"\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151\143"
+-"\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015\001"
+-"\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141\163"
+-"\151\143\100\164\150\141\167\164\145\056\143\157\155\060\036\027"
+-"\015\071\066\060\061\060\061\060\060\060\060\060\060\132\027\015"
+-"\062\060\061\062\063\061\062\063\065\071\065\071\132\060\201\313"
+-"\061\013\060\011\006\003\125\004\006\023\002\132\101\061\025\060"
+-"\023\006\003\125\004\010\023\014\127\145\163\164\145\162\156\040"
+-"\103\141\160\145\061\022\060\020\006\003\125\004\007\023\011\103"
+-"\141\160\145\040\124\157\167\156\061\032\060\030\006\003\125\004"
+-"\012\023\021\124\150\141\167\164\145\040\103\157\156\163\165\154"
+-"\164\151\156\147\061\050\060\046\006\003\125\004\013\023\037\103"
+-"\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145\162"
+-"\166\151\143\145\163\040\104\151\166\151\163\151\157\156\061\041"
+-"\060\037\006\003\125\004\003\023\030\124\150\141\167\164\145\040"
+-"\120\145\162\163\157\156\141\154\040\102\141\163\151\143\040\103"
+-"\101\061\050\060\046\006\011\052\206\110\206\367\015\001\011\001"
+-"\026\031\160\145\162\163\157\156\141\154\055\142\141\163\151\143"
+-"\100\164\150\141\167\164\145\056\143\157\155\060\201\237\060\015"
+-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
+-"\000\060\201\211\002\201\201\000\274\274\223\123\155\300\120\117"
+-"\202\025\346\110\224\065\246\132\276\157\102\372\017\107\356\167"
+-"\165\162\335\215\111\233\226\127\240\170\324\312\077\121\263\151"
+-"\013\221\166\027\042\007\227\152\304\121\223\113\340\215\357\067"
+-"\225\241\014\115\332\064\220\035\027\211\227\340\065\070\127\112"
+-"\300\364\010\160\351\074\104\173\120\176\141\232\220\343\043\323"
+-"\210\021\106\047\365\013\007\016\273\335\321\177\040\012\210\271"
+-"\126\013\056\034\200\332\361\343\236\051\357\024\275\012\104\373"
+-"\033\133\030\321\277\043\223\041\002\003\001\000\001\243\023\060"
+-"\021\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001"
+-"\001\377\060\015\006\011\052\206\110\206\367\015\001\001\004\005"
+-"\000\003\201\201\000\055\342\231\153\260\075\172\211\327\131\242"
+-"\224\001\037\053\335\022\113\123\302\255\177\252\247\000\134\221"
+-"\100\127\045\112\070\252\204\160\271\331\200\017\245\173\134\373"
+-"\163\306\275\327\212\141\134\003\343\055\047\250\027\340\204\205"
+-"\102\334\136\233\306\267\262\155\273\164\257\344\077\313\247\267"
+-"\260\340\135\276\170\203\045\224\322\333\201\017\171\007\155\117"
+-"\364\071\025\132\122\001\173\336\062\326\115\070\366\022\134\006"
+-"\120\337\005\133\275\024\113\241\337\051\272\073\101\215\367\143"
+-"\126\241\337\042\261"
+-, (PRUint32)805 }
+-};
+-static const NSSItem nss_builtins_items_9 [] = {
+-  { (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 *)"Thawte Personal Basic CA", (PRUint32)25 },
+-  { (void *)"\100\347\214\035\122\075\034\331\225\117\254\032\032\263\275\074"
+-"\272\241\133\374"
+-, (PRUint32)20 },
+-  { (void *)"\346\013\322\311\312\055\210\333\032\161\016\113\170\353\002\101"
+-, (PRUint32)16 },
+-  { (void *)"\060\201\313\061\013\060\011\006\003\125\004\006\023\002\132\101"
+-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+-"\156\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167"
+-"\164\145\040\120\145\162\163\157\156\141\154\040\102\141\163\151"
+-"\143\040\103\101\061\050\060\046\006\011\052\206\110\206\367\015"
+-"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141"
+-"\163\151\143\100\164\150\141\167\164\145\056\143\157\155"
+-, (PRUint32)206 },
+-  { (void *)"\002\001\000"
+-, (PRUint32)3 },
+-  { (void *)&ckt_netscape_trust_unknown, (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_10 [] = {
+-  { (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 *)"Thawte Personal Premium CA", (PRUint32)27 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\201\317\061\013\060\011\006\003\125\004\006\023\002\132\101"
+-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+-"\156\061\043\060\041\006\003\125\004\003\023\032\124\150\141\167"
+-"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155"
+-"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206"
+-"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055"
+-"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143"
+-"\157\155"
+-, (PRUint32)210 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\201\317\061\013\060\011\006\003\125\004\006\023\002\132\101"
+-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+-"\156\061\043\060\041\006\003\125\004\003\023\032\124\150\141\167"
+-"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155"
+-"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206"
+-"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055"
+-"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143"
+-"\157\155"
+-, (PRUint32)210 },
+-  { (void *)"\002\001\000"
+-, (PRUint32)3 },
+-  { (void *)"\060\202\003\051\060\202\002\222\240\003\002\001\002\002\001\000"
+-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+-"\201\317\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
+-"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162"
+-"\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023"
+-"\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006\003"
+-"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163"
+-"\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013\023"
+-"\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123"
+-"\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156"
+-"\061\043\060\041\006\003\125\004\003\023\032\124\150\141\167\164"
+-"\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155\151"
+-"\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206\367"
+-"\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055\160"
+-"\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143\157"
+-"\155\060\036\027\015\071\066\060\061\060\061\060\060\060\060\060"
+-"\060\132\027\015\062\060\061\062\063\061\062\063\065\071\065\071"
+-"\132\060\201\317\061\013\060\011\006\003\125\004\006\023\002\132"
+-"\101\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164"
+-"\145\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004"
+-"\007\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030"
+-"\006\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157"
+-"\156\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004"
+-"\013\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156"
+-"\040\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151"
+-"\157\156\061\043\060\041\006\003\125\004\003\023\032\124\150\141"
+-"\167\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145"
+-"\155\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110"
+-"\206\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154"
+-"\055\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056"
+-"\143\157\155\060\201\237\060\015\006\011\052\206\110\206\367\015"
+-"\001\001\001\005\000\003\201\215\000\060\201\211\002\201\201\000"
+-"\311\146\331\370\007\104\317\271\214\056\360\241\357\023\105\154"
+-"\005\337\336\047\026\121\066\101\021\154\154\073\355\376\020\175"
+-"\022\236\345\233\102\232\376\140\061\303\146\267\163\072\110\256"
+-"\116\320\062\067\224\210\265\015\266\331\363\362\104\331\325\210"
+-"\022\335\166\115\362\032\374\157\043\036\172\361\330\230\105\116"
+-"\007\020\357\026\102\320\103\165\155\112\336\342\252\311\061\377"
+-"\037\000\160\174\146\317\020\045\010\272\372\356\000\351\106\003"
+-"\146\047\021\025\073\252\133\362\230\335\066\102\262\332\210\165"
+-"\002\003\001\000\001\243\023\060\021\060\017\006\003\125\035\023"
+-"\001\001\377\004\005\060\003\001\001\377\060\015\006\011\052\206"
+-"\110\206\367\015\001\001\004\005\000\003\201\201\000\151\066\211"
+-"\367\064\052\063\162\057\155\073\324\042\262\270\157\232\305\066"
+-"\146\016\033\074\241\261\165\132\346\375\065\323\370\250\362\007"
+-"\157\205\147\216\336\053\271\342\027\260\072\240\360\016\242\000"
+-"\232\337\363\024\025\156\273\310\205\132\230\200\371\377\276\164"
+-"\035\075\363\376\060\045\321\067\064\147\372\245\161\171\060\141"
+-"\051\162\300\340\054\114\373\126\344\072\250\157\345\062\131\122"
+-"\333\165\050\120\131\014\370\013\031\344\254\331\257\226\215\057"
+-"\120\333\007\303\352\037\253\063\340\365\053\061\211"
+-, (PRUint32)813 }
+-};
+-static const NSSItem nss_builtins_items_11 [] = {
+-  { (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 *)"Thawte Personal Premium CA", (PRUint32)27 },
+-  { (void *)"\066\206\065\143\375\121\050\307\276\246\360\005\317\351\264\066"
+-"\150\010\154\316"
+-, (PRUint32)20 },
+-  { (void *)"\072\262\336\042\232\040\223\111\371\355\310\322\212\347\150\015"
+-, (PRUint32)16 },
+-  { (void *)"\060\201\317\061\013\060\011\006\003\125\004\006\023\002\132\101"
+-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+-"\156\061\043\060\041\006\003\125\004\003\023\032\124\150\141\167"
+-"\164\145\040\120\145\162\163\157\156\141\154\040\120\162\145\155"
+-"\151\165\155\040\103\101\061\052\060\050\006\011\052\206\110\206"
+-"\367\015\001\011\001\026\033\160\145\162\163\157\156\141\154\055"
+-"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143"
+-"\157\155"
+-, (PRUint32)210 },
+-  { (void *)"\002\001\000"
+-, (PRUint32)3 },
+-  { (void *)&ckt_netscape_trust_unknown, (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_12 [] = {
++static const NSSItem nss_builtins_items_6 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -1648,7 +1247,7 @@ static const NSSItem nss_builtins_items_12 [] = {
+ "\201"
+ , (PRUint32)817 }
+ };
+-static const NSSItem nss_builtins_items_13 [] = {
++static const NSSItem nss_builtins_items_7 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -1681,7 +1280,7 @@ static const NSSItem nss_builtins_items_13 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_14 [] = {
++static const NSSItem nss_builtins_items_8 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -1771,7 +1370,7 @@ static const NSSItem nss_builtins_items_14 [] = {
+ "\243\377\212\043\056\160\107"
+ , (PRUint32)791 }
+ };
+-static const NSSItem nss_builtins_items_15 [] = {
++static const NSSItem nss_builtins_items_9 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -1801,9 +1400,9 @@ static const NSSItem nss_builtins_items_15 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_16 [] = {
++static const NSSItem nss_builtins_items_10 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -1896,7 +1495,7 @@ static const NSSItem nss_builtins_items_16 [] = {
+ "\246\015\246\043\371\273\313\246\007\024\102"
+ , (PRUint32)811 }
+ };
+-static const NSSItem nss_builtins_items_17 [] = {
++static const NSSItem nss_builtins_items_11 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -1927,9 +1526,9 @@ static const NSSItem nss_builtins_items_17 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_18 [] = {
++static const NSSItem nss_builtins_items_12 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2004,7 +1603,7 @@ static const NSSItem nss_builtins_items_18 [] = {
+ "\254\007\167\070"
+ , (PRUint32)804 }
+ };
+-static const NSSItem nss_builtins_items_19 [] = {
++static const NSSItem nss_builtins_items_13 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2028,129 +1627,7 @@ static const NSSItem nss_builtins_items_19 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_20 [] = {
+-  { (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 *)"ABAecom (sub., Am. Bankers Assn.) Root CA", (PRUint32)42 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\201\211\061\013\060\011\006\003\125\004\006\023\002\125\123"
+-"\061\013\060\011\006\003\125\004\010\023\002\104\103\061\023\060"
+-"\021\006\003\125\004\007\023\012\127\141\163\150\151\156\147\164"
+-"\157\156\061\027\060\025\006\003\125\004\012\023\016\101\102\101"
+-"\056\105\103\117\115\054\040\111\116\103\056\061\031\060\027\006"
+-"\003\125\004\003\023\020\101\102\101\056\105\103\117\115\040\122"
+-"\157\157\164\040\103\101\061\044\060\042\006\011\052\206\110\206"
+-"\367\015\001\011\001\026\025\141\144\155\151\156\100\144\151\147"
+-"\163\151\147\164\162\165\163\164\056\143\157\155"
+-, (PRUint32)140 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\201\211\061\013\060\011\006\003\125\004\006\023\002\125\123"
+-"\061\013\060\011\006\003\125\004\010\023\002\104\103\061\023\060"
+-"\021\006\003\125\004\007\023\012\127\141\163\150\151\156\147\164"
+-"\157\156\061\027\060\025\006\003\125\004\012\023\016\101\102\101"
+-"\056\105\103\117\115\054\040\111\116\103\056\061\031\060\027\006"
+-"\003\125\004\003\023\020\101\102\101\056\105\103\117\115\040\122"
+-"\157\157\164\040\103\101\061\044\060\042\006\011\052\206\110\206"
+-"\367\015\001\011\001\026\025\141\144\155\151\156\100\144\151\147"
+-"\163\151\147\164\162\165\163\164\056\143\157\155"
+-, (PRUint32)140 },
+-  { (void *)"\002\021\000\320\036\100\220\000\000\106\122\000\000\000\001\000"
+-"\000\000\004"
+-, (PRUint32)19 },
+-  { (void *)"\060\202\003\265\060\202\002\235\240\003\002\001\002\002\021\000"
+-"\320\036\100\220\000\000\106\122\000\000\000\001\000\000\000\004"
+-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+-"\201\211\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+-"\013\060\011\006\003\125\004\010\023\002\104\103\061\023\060\021"
+-"\006\003\125\004\007\023\012\127\141\163\150\151\156\147\164\157"
+-"\156\061\027\060\025\006\003\125\004\012\023\016\101\102\101\056"
+-"\105\103\117\115\054\040\111\116\103\056\061\031\060\027\006\003"
+-"\125\004\003\023\020\101\102\101\056\105\103\117\115\040\122\157"
+-"\157\164\040\103\101\061\044\060\042\006\011\052\206\110\206\367"
+-"\015\001\011\001\026\025\141\144\155\151\156\100\144\151\147\163"
+-"\151\147\164\162\165\163\164\056\143\157\155\060\036\027\015\071"
+-"\071\060\067\061\062\061\067\063\063\065\063\132\027\015\060\071"
+-"\060\067\060\071\061\067\063\063\065\063\132\060\201\211\061\013"
+-"\060\011\006\003\125\004\006\023\002\125\123\061\013\060\011\006"
+-"\003\125\004\010\023\002\104\103\061\023\060\021\006\003\125\004"
+-"\007\023\012\127\141\163\150\151\156\147\164\157\156\061\027\060"
+-"\025\006\003\125\004\012\023\016\101\102\101\056\105\103\117\115"
+-"\054\040\111\116\103\056\061\031\060\027\006\003\125\004\003\023"
+-"\020\101\102\101\056\105\103\117\115\040\122\157\157\164\040\103"
+-"\101\061\044\060\042\006\011\052\206\110\206\367\015\001\011\001"
+-"\026\025\141\144\155\151\156\100\144\151\147\163\151\147\164\162"
+-"\165\163\164\056\143\157\155\060\202\001\042\060\015\006\011\052"
+-"\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060"
+-"\202\001\012\002\202\001\001\000\261\323\021\340\171\125\103\007"
+-"\010\114\313\005\102\000\342\015\203\106\075\344\223\272\266\006"
+-"\323\015\131\275\076\301\316\103\147\001\212\041\250\357\274\314"
+-"\320\242\314\260\125\226\123\204\146\005\000\332\104\111\200\330"
+-"\124\012\245\045\206\224\355\143\126\377\160\154\243\241\031\322"
+-"\170\276\150\052\104\136\057\317\314\030\136\107\274\072\261\106"
+-"\075\036\360\271\054\064\137\214\174\114\010\051\235\100\125\353"
+-"\074\175\203\336\265\360\367\212\203\016\241\114\264\072\245\263"
+-"\137\132\042\227\354\031\233\301\005\150\375\346\267\251\221\224"
+-"\054\344\170\110\044\032\045\031\072\353\225\234\071\012\212\317"
+-"\102\262\360\034\325\137\373\153\355\150\126\173\071\054\162\070"
+-"\260\356\223\251\323\173\167\074\353\161\003\251\070\112\026\154"
+-"\211\052\312\332\063\023\171\302\125\214\355\234\273\362\313\133"
+-"\020\370\056\141\065\306\051\114\052\320\052\143\321\145\131\264"
+-"\370\315\371\364\000\204\266\127\102\205\235\062\250\371\052\124"
+-"\373\377\170\101\274\275\161\050\364\273\220\274\377\226\064\004"
+-"\343\105\236\241\106\050\100\201\002\003\001\000\001\243\026\060"
+-"\024\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001"
+-"\001\377\002\001\010\060\015\006\011\052\206\110\206\367\015\001"
+-"\001\005\005\000\003\202\001\001\000\004\157\045\206\344\346\226"
+-"\047\264\331\102\300\320\311\000\261\177\124\076\207\262\155\044"
+-"\251\057\012\176\375\244\104\260\370\124\007\275\033\235\235\312"
+-"\173\120\044\173\021\133\111\243\246\277\022\164\325\211\267\267"
+-"\057\230\144\045\024\267\141\351\177\140\200\153\323\144\350\253"
+-"\275\032\326\121\372\300\264\135\167\032\177\144\010\136\171\306"
+-"\005\114\361\172\335\115\175\316\346\110\173\124\322\141\222\201"
+-"\326\033\326\000\360\016\236\050\167\240\115\210\307\042\166\031"
+-"\303\307\236\033\246\167\170\370\137\233\126\321\360\362\027\254"
+-"\216\235\131\346\037\376\127\266\331\136\341\135\237\105\354\141"
+-"\150\031\101\341\262\040\046\376\132\060\166\044\377\100\162\074"
+-"\171\237\174\042\110\253\106\315\333\263\206\054\217\277\005\101"
+-"\323\301\343\024\343\101\027\046\320\174\247\161\114\031\350\112"
+-"\017\162\130\061\175\354\140\172\243\042\050\275\031\044\140\077"
+-"\073\207\163\300\153\344\313\256\267\253\045\103\262\125\055\173"
+-"\253\006\016\165\135\064\345\135\163\155\236\262\165\100\245\131"
+-"\311\117\061\161\210\331\210\177\124"
+-, (PRUint32)953 }
+-};
+-static const NSSItem nss_builtins_items_21 [] = {
+-  { (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 *)"ABAecom (sub., Am. Bankers Assn.) Root CA", (PRUint32)42 },
+-  { (void *)"\172\164\101\017\260\315\134\227\052\066\113\161\277\003\035\210"
+-"\246\121\016\236"
+-, (PRUint32)20 },
+-  { (void *)"\101\270\007\367\250\321\011\356\264\232\216\160\115\374\033\170"
+-, (PRUint32)16 },
+-  { (void *)"\060\201\211\061\013\060\011\006\003\125\004\006\023\002\125\123"
+-"\061\013\060\011\006\003\125\004\010\023\002\104\103\061\023\060"
+-"\021\006\003\125\004\007\023\012\127\141\163\150\151\156\147\164"
+-"\157\156\061\027\060\025\006\003\125\004\012\023\016\101\102\101"
+-"\056\105\103\117\115\054\040\111\116\103\056\061\031\060\027\006"
+-"\003\125\004\003\023\020\101\102\101\056\105\103\117\115\040\122"
+-"\157\157\164\040\103\101\061\044\060\042\006\011\052\206\110\206"
+-"\367\015\001\011\001\026\025\141\144\155\151\156\100\144\151\147"
+-"\163\151\147\164\162\165\163\164\056\143\157\155"
+-, (PRUint32)140 },
+-  { (void *)"\002\021\000\320\036\100\220\000\000\106\122\000\000\000\001\000"
+-"\000\000\004"
+-, (PRUint32)19 },
+-  { (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_true, (PRUint32)sizeof(CK_BBOOL) }
+-};
+-static const NSSItem nss_builtins_items_22 [] = {
++static const NSSItem nss_builtins_items_14 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2225,7 +1702,7 @@ static const NSSItem nss_builtins_items_22 [] = {
+ "\241\223\004\273\206\237\072\133\103\172\303\212\145"
+ , (PRUint32)813 }
+ };
+-static const NSSItem nss_builtins_items_23 [] = {
++static const NSSItem nss_builtins_items_15 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2247,9 +1724,9 @@ static const NSSItem nss_builtins_items_23 [] = {
+   { (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_true, (PRUint32)sizeof(CK_BBOOL) }
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_24 [] = {
++static const NSSItem nss_builtins_items_16 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2324,7 +1801,7 @@ static const NSSItem nss_builtins_items_24 [] = {
+ "\307\177\033\033\326\006\040\002\130\241\303\242\003"
+ , (PRUint32)813 }
+ };
+-static const NSSItem nss_builtins_items_25 [] = {
++static const NSSItem nss_builtins_items_17 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2346,269 +1823,9 @@ static const NSSItem nss_builtins_items_25 [] = {
+   { (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_true, (PRUint32)sizeof(CK_BBOOL) }
+-};
+-static const NSSItem nss_builtins_items_26 [] = {
+-  { (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 *)"Digital Signature Trust Co. Global CA 2", (PRUint32)40 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163"
+-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061"
+-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114"
+-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004"
+-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141"
+-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021"
+-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130"
+-"\061\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040"
+-"\122\157\157\164\103\101\040\130\061\061\041\060\037\006\011\052"
+-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147"
+-"\163\151\147\164\162\165\163\164\056\143\157\155"
+-, (PRUint32)172 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163"
+-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061"
+-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114"
+-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004"
+-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141"
+-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021"
+-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130"
+-"\061\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040"
+-"\122\157\157\164\103\101\040\130\061\061\041\060\037\006\011\052"
+-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147"
+-"\163\151\147\164\162\165\163\164\056\143\157\155"
+-, (PRUint32)172 },
+-  { (void *)"\002\021\000\320\036\100\213\000\000\002\174\000\000\000\002\000"
+-"\000\000\001"
+-, (PRUint32)19 },
+-  { (void *)"\060\202\003\330\060\202\002\300\002\021\000\320\036\100\213\000"
+-"\000\002\174\000\000\000\002\000\000\000\001\060\015\006\011\052"
+-"\206\110\206\367\015\001\001\005\005\000\060\201\251\061\013\060"
+-"\011\006\003\125\004\006\023\002\165\163\061\015\060\013\006\003"
+-"\125\004\010\023\004\125\164\141\150\061\027\060\025\006\003\125"
+-"\004\007\023\016\123\141\154\164\040\114\141\153\145\040\103\151"
+-"\164\171\061\044\060\042\006\003\125\004\012\023\033\104\151\147"
+-"\151\164\141\154\040\123\151\147\156\141\164\165\162\145\040\124"
+-"\162\165\163\164\040\103\157\056\061\021\060\017\006\003\125\004"
+-"\013\023\010\104\123\124\103\101\040\130\061\061\026\060\024\006"
+-"\003\125\004\003\023\015\104\123\124\040\122\157\157\164\103\101"
+-"\040\130\061\061\041\060\037\006\011\052\206\110\206\367\015\001"
+-"\011\001\026\022\143\141\100\144\151\147\163\151\147\164\162\165"
+-"\163\164\056\143\157\155\060\036\027\015\071\070\061\062\060\061"
+-"\061\070\061\070\065\065\132\027\015\060\070\061\061\062\070\061"
+-"\070\061\070\065\065\132\060\201\251\061\013\060\011\006\003\125"
+-"\004\006\023\002\165\163\061\015\060\013\006\003\125\004\010\023"
+-"\004\125\164\141\150\061\027\060\025\006\003\125\004\007\023\016"
+-"\123\141\154\164\040\114\141\153\145\040\103\151\164\171\061\044"
+-"\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141\154"
+-"\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163\164"
+-"\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010\104"
+-"\123\124\103\101\040\130\061\061\026\060\024\006\003\125\004\003"
+-"\023\015\104\123\124\040\122\157\157\164\103\101\040\130\061\061"
+-"\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026\022"
+-"\143\141\100\144\151\147\163\151\147\164\162\165\163\164\056\143"
+-"\157\155\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
+-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
+-"\001\001\000\322\306\046\266\347\245\075\301\304\150\325\120\157"
+-"\123\305\157\111\023\011\270\257\054\110\215\024\152\243\027\137"
+-"\132\371\323\056\165\057\330\050\142\321\223\057\374\115\324\253"
+-"\207\345\010\307\231\347\222\077\165\275\353\045\264\025\301\233"
+-"\031\075\322\104\215\327\164\040\155\067\002\217\151\223\133\212"
+-"\304\031\235\364\262\016\374\026\154\271\261\005\222\203\321\205"
+-"\054\140\224\076\105\125\240\331\253\010\041\346\140\350\073\164"
+-"\362\231\120\121\150\320\003\055\261\200\276\243\330\122\260\104"
+-"\315\103\112\160\216\130\205\225\341\116\054\326\055\101\157\326"
+-"\204\347\310\230\104\312\107\333\054\044\245\151\046\317\153\270"
+-"\047\142\303\364\311\172\222\043\355\023\147\202\256\105\056\105"
+-"\345\176\162\077\205\235\224\142\020\346\074\221\241\255\167\000"
+-"\340\025\354\363\204\200\162\172\216\156\140\227\307\044\131\020"
+-"\064\203\133\341\245\244\151\266\127\065\034\170\131\306\323\057"
+-"\072\163\147\356\224\312\004\023\005\142\006\160\043\263\364\174"
+-"\356\105\331\144\013\133\111\252\244\103\316\046\304\104\022\154"
+-"\270\335\171\002\003\001\000\001\060\015\006\011\052\206\110\206"
+-"\367\015\001\001\005\005\000\003\202\001\001\000\242\067\262\077"
+-"\151\373\327\206\171\124\111\061\225\063\053\363\321\011\024\111"
+-"\142\140\206\245\260\021\342\120\302\035\006\127\076\055\350\063"
+-"\144\276\233\252\255\137\033\115\324\231\225\242\213\232\311\142"
+-"\162\265\151\352\331\130\253\065\355\025\242\103\326\266\274\007"
+-"\171\145\144\163\175\327\171\312\173\325\132\121\306\341\123\004"
+-"\226\215\070\317\243\027\254\071\161\153\001\303\213\123\074\143"
+-"\351\356\171\300\344\276\222\062\144\172\263\037\227\224\142\275"
+-"\352\262\040\025\225\373\227\362\170\057\143\066\100\070\343\106"
+-"\017\035\335\254\225\312\347\113\220\173\261\113\251\324\305\353"
+-"\232\332\252\325\243\224\024\106\215\055\037\363\072\326\223\072"
+-"\366\076\171\374\350\346\260\165\355\356\075\311\160\307\135\252"
+-"\201\113\106\045\034\307\154\025\343\225\116\017\252\062\067\224"
+-"\012\027\044\222\023\204\130\322\143\157\053\367\346\133\142\013"
+-"\023\027\260\015\122\114\376\376\157\134\342\221\156\035\375\244"
+-"\142\327\150\372\216\172\117\322\010\332\223\334\360\222\021\172"
+-"\320\334\162\223\014\163\223\142\205\150\320\364"
+-, (PRUint32)988 }
+-};
+-static const NSSItem nss_builtins_items_27 [] = {
+-  { (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 *)"Digital Signature Trust Co. Global CA 2", (PRUint32)40 },
+-  { (void *)"\267\057\377\222\322\316\103\336\012\215\114\124\214\120\067\046"
+-"\250\036\053\223"
+-, (PRUint32)20 },
+-  { (void *)"\154\311\247\156\107\361\014\343\123\073\170\114\115\302\152\305"
+-, (PRUint32)16 },
+-  { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163"
+-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061"
+-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114"
+-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004"
+-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141"
+-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021"
+-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130"
+-"\061\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040"
+-"\122\157\157\164\103\101\040\130\061\061\041\060\037\006\011\052"
+-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147"
+-"\163\151\147\164\162\165\163\164\056\143\157\155"
+-, (PRUint32)172 },
+-  { (void *)"\002\021\000\320\036\100\213\000\000\002\174\000\000\000\002\000"
+-"\000\000\001"
+-, (PRUint32)19 },
+-  { (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_true, (PRUint32)sizeof(CK_BBOOL) }
+-};
+-static const NSSItem nss_builtins_items_28 [] = {
+-  { (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 *)"Digital Signature Trust Co. Global CA 4", (PRUint32)40 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163"
+-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061"
+-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114"
+-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004"
+-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141"
+-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021"
+-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130"
+-"\062\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040"
+-"\122\157\157\164\103\101\040\130\062\061\041\060\037\006\011\052"
+-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147"
+-"\163\151\147\164\162\165\163\164\056\143\157\155"
+-, (PRUint32)172 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163"
+-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061"
+-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114"
+-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004"
+-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141"
+-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021"
+-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130"
+-"\062\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040"
+-"\122\157\157\164\103\101\040\130\062\061\041\060\037\006\011\052"
+-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147"
+-"\163\151\147\164\162\165\163\164\056\143\157\155"
+-, (PRUint32)172 },
+-  { (void *)"\002\021\000\320\036\100\213\000\000\167\155\000\000\000\001\000"
+-"\000\000\004"
+-, (PRUint32)19 },
+-  { (void *)"\060\202\003\330\060\202\002\300\002\021\000\320\036\100\213\000"
+-"\000\167\155\000\000\000\001\000\000\000\004\060\015\006\011\052"
+-"\206\110\206\367\015\001\001\005\005\000\060\201\251\061\013\060"
+-"\011\006\003\125\004\006\023\002\165\163\061\015\060\013\006\003"
+-"\125\004\010\023\004\125\164\141\150\061\027\060\025\006\003\125"
+-"\004\007\023\016\123\141\154\164\040\114\141\153\145\040\103\151"
+-"\164\171\061\044\060\042\006\003\125\004\012\023\033\104\151\147"
+-"\151\164\141\154\040\123\151\147\156\141\164\165\162\145\040\124"
+-"\162\165\163\164\040\103\157\056\061\021\060\017\006\003\125\004"
+-"\013\023\010\104\123\124\103\101\040\130\062\061\026\060\024\006"
+-"\003\125\004\003\023\015\104\123\124\040\122\157\157\164\103\101"
+-"\040\130\062\061\041\060\037\006\011\052\206\110\206\367\015\001"
+-"\011\001\026\022\143\141\100\144\151\147\163\151\147\164\162\165"
+-"\163\164\056\143\157\155\060\036\027\015\071\070\061\061\063\060"
+-"\062\062\064\066\061\066\132\027\015\060\070\061\061\062\067\062"
+-"\062\064\066\061\066\132\060\201\251\061\013\060\011\006\003\125"
+-"\004\006\023\002\165\163\061\015\060\013\006\003\125\004\010\023"
+-"\004\125\164\141\150\061\027\060\025\006\003\125\004\007\023\016"
+-"\123\141\154\164\040\114\141\153\145\040\103\151\164\171\061\044"
+-"\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141\154"
+-"\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163\164"
+-"\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010\104"
+-"\123\124\103\101\040\130\062\061\026\060\024\006\003\125\004\003"
+-"\023\015\104\123\124\040\122\157\157\164\103\101\040\130\062\061"
+-"\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026\022"
+-"\143\141\100\144\151\147\163\151\147\164\162\165\163\164\056\143"
+-"\157\155\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
+-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
+-"\001\001\000\334\165\360\214\300\165\226\232\300\142\037\046\367"
+-"\304\341\232\352\340\126\163\133\231\315\001\104\250\010\266\325"
+-"\247\332\032\004\030\071\222\112\170\243\201\302\365\167\172\120"
+-"\264\160\377\232\253\306\307\312\156\203\117\102\230\373\046\013"
+-"\332\334\155\326\251\231\125\122\147\351\050\003\222\334\345\260"
+-"\005\232\017\025\371\153\131\162\126\362\372\071\374\252\150\356"
+-"\017\037\020\203\057\374\235\372\027\226\335\202\343\346\105\175"
+-"\300\113\200\104\037\355\054\340\204\375\221\134\222\124\151\045"
+-"\345\142\151\334\345\356\000\122\275\063\013\255\165\002\205\247"
+-"\144\120\055\305\031\031\060\300\046\333\311\323\375\056\231\255"
+-"\131\265\013\115\324\101\256\205\110\103\131\334\267\250\342\242"
+-"\336\303\217\327\270\241\142\246\150\120\122\344\317\061\247\224"
+-"\205\332\237\106\062\027\126\345\362\353\146\075\022\377\103\333"
+-"\230\357\167\317\313\201\215\064\261\306\120\112\046\321\344\076"
+-"\101\120\257\154\256\042\064\056\325\153\156\203\272\171\270\166"
+-"\145\110\332\011\051\144\143\042\271\373\107\166\205\214\206\104"
+-"\313\011\333\002\003\001\000\001\060\015\006\011\052\206\110\206"
+-"\367\015\001\001\005\005\000\003\202\001\001\000\265\066\016\135"
+-"\341\141\050\132\021\145\300\077\203\003\171\115\276\050\246\013"
+-"\007\002\122\205\315\370\221\320\020\154\265\152\040\133\034\220"
+-"\331\060\074\306\110\236\212\136\144\371\241\161\167\357\004\047"
+-"\037\007\353\344\046\367\163\164\311\104\030\032\146\323\340\103"
+-"\257\221\073\321\313\054\330\164\124\072\034\115\312\324\150\315"
+-"\043\174\035\020\236\105\351\366\000\156\246\315\031\377\117\054"
+-"\051\217\127\115\304\167\222\276\340\114\011\373\135\104\206\146"
+-"\041\250\271\062\242\126\325\351\214\203\174\131\077\304\361\013"
+-"\347\235\354\236\275\234\030\016\076\302\071\171\050\267\003\015"
+-"\010\313\306\347\331\001\067\120\020\354\314\141\026\100\324\257"
+-"\061\164\173\374\077\061\247\320\107\163\063\071\033\314\116\152"
+-"\327\111\203\021\006\376\353\202\130\063\062\114\360\126\254\036"
+-"\234\057\126\232\173\301\112\034\245\375\125\066\316\374\226\115"
+-"\364\260\360\354\267\154\202\355\057\061\231\102\114\251\262\015"
+-"\270\025\135\361\337\272\311\265\112\324\144\230\263\046\251\060"
+-"\310\375\246\354\253\226\041\255\177\302\170\266"
+-, (PRUint32)988 }
+-};
+-static const NSSItem nss_builtins_items_29 [] = {
+-  { (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 *)"Digital Signature Trust Co. Global CA 4", (PRUint32)40 },
+-  { (void *)"\147\353\063\173\150\114\353\016\302\260\166\012\264\210\047\214"
+-"\335\225\227\335"
+-, (PRUint32)20 },
+-  { (void *)"\315\073\075\142\133\011\270\011\066\207\236\022\057\161\144\272"
+-, (PRUint32)16 },
+-  { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163"
+-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061"
+-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114"
+-"\141\153\145\040\103\151\164\171\061\044\060\042\006\003\125\004"
+-"\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156\141"
+-"\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061\021"
+-"\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040\130"
+-"\062\061\026\060\024\006\003\125\004\003\023\015\104\123\124\040"
+-"\122\157\157\164\103\101\040\130\062\061\041\060\037\006\011\052"
+-"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147"
+-"\163\151\147\164\162\165\163\164\056\143\157\155"
+-, (PRUint32)172 },
+-  { (void *)"\002\021\000\320\036\100\213\000\000\167\155\000\000\000\001\000"
+-"\000\000\004"
+-, (PRUint32)19 },
+-  { (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_true, (PRUint32)sizeof(CK_BBOOL) }
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_30 [] = {
++static const NSSItem nss_builtins_items_18 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2674,7 +1891,7 @@ static const NSSItem nss_builtins_items_30 [] = {
+ "\224"
+ , (PRUint32)577 }
+ };
+-static const NSSItem nss_builtins_items_31 [] = {
++static const NSSItem nss_builtins_items_19 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2701,7 +1918,7 @@ static const NSSItem nss_builtins_items_31 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_32 [] = {
++static const NSSItem nss_builtins_items_20 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2766,7 +1983,7 @@ static const NSSItem nss_builtins_items_32 [] = {
+ "\360\210\321\345\170\215\245\052\117\366\227\015\027\167\312\330"
+ , (PRUint32)576 }
+ };
+-static const NSSItem nss_builtins_items_33 [] = {
++static const NSSItem nss_builtins_items_21 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2793,7 +2010,7 @@ static const NSSItem nss_builtins_items_33 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_34 [] = {
++static const NSSItem nss_builtins_items_22 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2858,7 +2075,7 @@ static const NSSItem nss_builtins_items_34 [] = {
+ "\300\175\267\162\234\311\066\072\153\237\116\250\377\144\015\144"
+ , (PRUint32)576 }
+ };
+-static const NSSItem nss_builtins_items_35 [] = {
++static const NSSItem nss_builtins_items_23 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2883,9 +2100,9 @@ static const NSSItem nss_builtins_items_35 [] = {
+   { (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_true, (PRUint32)sizeof(CK_BBOOL) }
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_36 [] = {
++static const NSSItem nss_builtins_items_24 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -2975,7 +2192,7 @@ static const NSSItem nss_builtins_items_36 [] = {
+ "\017\061\134\350\362\331"
+ , (PRUint32)774 }
+ };
+-static const NSSItem nss_builtins_items_37 [] = {
++static const NSSItem nss_builtins_items_25 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3008,7 +2225,7 @@ static const NSSItem nss_builtins_items_37 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_38 [] = {
++static const NSSItem nss_builtins_items_26 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3098,7 +2315,7 @@ static const NSSItem nss_builtins_items_38 [] = {
+ "\214\022\173\305\104\264\256"
+ , (PRUint32)775 }
+ };
+-static const NSSItem nss_builtins_items_39 [] = {
++static const NSSItem nss_builtins_items_27 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3131,7 +2348,7 @@ static const NSSItem nss_builtins_items_39 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_40 [] = {
++static const NSSItem nss_builtins_items_28 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3221,7 +2438,7 @@ static const NSSItem nss_builtins_items_40 [] = {
+ "\240\235\235\151\221\375"
+ , (PRUint32)774 }
+ };
+-static const NSSItem nss_builtins_items_41 [] = {
++static const NSSItem nss_builtins_items_29 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3254,7 +2471,7 @@ static const NSSItem nss_builtins_items_41 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_42 [] = {
++static const NSSItem nss_builtins_items_30 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3344,7 +2561,7 @@ static const NSSItem nss_builtins_items_42 [] = {
+ "\117\312\200\221\266\051"
+ , (PRUint32)774 }
+ };
+-static const NSSItem nss_builtins_items_43 [] = {
++static const NSSItem nss_builtins_items_31 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3375,9 +2592,9 @@ static const NSSItem nss_builtins_items_43 [] = {
+   { (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_true, (PRUint32)sizeof(CK_BBOOL) }
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_44 [] = {
++static const NSSItem nss_builtins_items_32 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3459,7 +2676,7 @@ static const NSSItem nss_builtins_items_44 [] = {
+ "\125\342\374\110\311\051\046\151\340"
+ , (PRUint32)889 }
+ };
+-static const NSSItem nss_builtins_items_45 [] = {
++static const NSSItem nss_builtins_items_33 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3484,7 +2701,7 @@ static const NSSItem nss_builtins_items_45 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_46 [] = {
++static const NSSItem nss_builtins_items_34 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3568,7 +2785,7 @@ static const NSSItem nss_builtins_items_46 [] = {
+ "\152\374\176\102\070\100\144\022\367\236\201\341\223\056"
+ , (PRUint32)958 }
+ };
+-static const NSSItem nss_builtins_items_47 [] = {
++static const NSSItem nss_builtins_items_35 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3592,7 +2809,7 @@ static const NSSItem nss_builtins_items_47 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_48 [] = {
++static const NSSItem nss_builtins_items_36 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3677,7 +2894,7 @@ static const NSSItem nss_builtins_items_48 [] = {
+ "\161\202\053\231\317\072\267\365\055\162\310"
+ , (PRUint32)747 }
+ };
+-static const NSSItem nss_builtins_items_49 [] = {
++static const NSSItem nss_builtins_items_37 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3708,7 +2925,7 @@ static const NSSItem nss_builtins_items_49 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_50 [] = {
++static const NSSItem nss_builtins_items_38 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3793,7 +3010,7 @@ static const NSSItem nss_builtins_items_50 [] = {
+ "\276\355\164\114\274\133\325\142\037\103\335"
+ , (PRUint32)747 }
+ };
+-static const NSSItem nss_builtins_items_51 [] = {
++static const NSSItem nss_builtins_items_39 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3824,7 +3041,7 @@ static const NSSItem nss_builtins_items_51 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_52 [] = {
++static const NSSItem nss_builtins_items_40 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3909,7 +3126,7 @@ static const NSSItem nss_builtins_items_52 [] = {
+ "\040\017\105\176\153\242\177\243\214\025\356"
+ , (PRUint32)747 }
+ };
+-static const NSSItem nss_builtins_items_53 [] = {
++static const NSSItem nss_builtins_items_41 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -3940,7 +3157,7 @@ static const NSSItem nss_builtins_items_53 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_54 [] = {
++static const NSSItem nss_builtins_items_42 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4047,7 +3264,7 @@ static const NSSItem nss_builtins_items_54 [] = {
+ "\113\336\006\226\161\054\362\333\266\037\244\357\077\356"
+ , (PRUint32)1054 }
+ };
+-static const NSSItem nss_builtins_items_55 [] = {
++static const NSSItem nss_builtins_items_43 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4080,7 +3297,7 @@ static const NSSItem nss_builtins_items_55 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_56 [] = {
++static const NSSItem nss_builtins_items_44 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4187,7 +3404,7 @@ static const NSSItem nss_builtins_items_56 [] = {
+ "\311\130\020\371\252\357\132\266\317\113\113\337\052"
+ , (PRUint32)1053 }
+ };
+-static const NSSItem nss_builtins_items_57 [] = {
++static const NSSItem nss_builtins_items_45 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4220,7 +3437,7 @@ static const NSSItem nss_builtins_items_57 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_58 [] = {
++static const NSSItem nss_builtins_items_46 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4327,7 +3544,7 @@ static const NSSItem nss_builtins_items_58 [] = {
+ "\153\271\012\172\116\117\113\204\356\113\361\175\335\021"
+ , (PRUint32)1054 }
+ };
+-static const NSSItem nss_builtins_items_59 [] = {
++static const NSSItem nss_builtins_items_47 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4360,7 +3577,7 @@ static const NSSItem nss_builtins_items_59 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_60 [] = {
++static const NSSItem nss_builtins_items_48 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4467,7 +3684,7 @@ static const NSSItem nss_builtins_items_60 [] = {
+ "\367\146\103\363\236\203\076\040\252\303\065\140\221\316"
+ , (PRUint32)1054 }
+ };
+-static const NSSItem nss_builtins_items_61 [] = {
++static const NSSItem nss_builtins_items_49 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4498,9 +3715,9 @@ static const NSSItem nss_builtins_items_61 [] = {
+   { (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_true, (PRUint32)sizeof(CK_BBOOL) }
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_62 [] = {
++static const NSSItem nss_builtins_items_50 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4618,7 +3835,7 @@ static const NSSItem nss_builtins_items_62 [] = {
+ "\155\055\105\013\367\012\223\352\355\006\371\262"
+ , (PRUint32)1244 }
+ };
+-static const NSSItem nss_builtins_items_63 [] = {
++static const NSSItem nss_builtins_items_51 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4650,7 +3867,7 @@ static const NSSItem nss_builtins_items_63 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_64 [] = {
++static const NSSItem nss_builtins_items_52 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4770,7 +3987,7 @@ static const NSSItem nss_builtins_items_64 [] = {
+ "\354"
+ , (PRUint32)1265 }
+ };
+-static const NSSItem nss_builtins_items_65 [] = {
++static const NSSItem nss_builtins_items_53 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4797,12 +4014,12 @@ static const NSSItem nss_builtins_items_65 [] = {
+ , (PRUint32)204 },
+   { (void *)"\002\004\070\003\221\356"
+ , (PRUint32)6 },
+-  { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_66 [] = {
++static const NSSItem nss_builtins_items_54 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4910,7 +4127,7 @@ static const NSSItem nss_builtins_items_66 [] = {
+ "\275\114\105\236\141\272\277\204\201\222\003\321\322\151\174\305"
+ , (PRUint32)1120 }
+ };
+-static const NSSItem nss_builtins_items_67 [] = {
++static const NSSItem nss_builtins_items_55 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -4941,7 +4158,7 @@ static const NSSItem nss_builtins_items_67 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_68 [] = {
++static const NSSItem nss_builtins_items_56 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5023,7 +4240,7 @@ static const NSSItem nss_builtins_items_68 [] = {
+ "\347\201\035\031\303\044\102\352\143\071\251"
+ , (PRUint32)891 }
+ };
+-static const NSSItem nss_builtins_items_69 [] = {
++static const NSSItem nss_builtins_items_57 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5048,7 +4265,7 @@ static const NSSItem nss_builtins_items_69 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_70 [] = {
++static const NSSItem nss_builtins_items_58 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5116,7 +4333,7 @@ static const NSSItem nss_builtins_items_70 [] = {
+ "\126\224\251\125"
+ , (PRUint32)660 }
+ };
+-static const NSSItem nss_builtins_items_71 [] = {
++static const NSSItem nss_builtins_items_59 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5141,7 +4358,7 @@ static const NSSItem nss_builtins_items_71 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_72 [] = {
++static const NSSItem nss_builtins_items_60 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5208,7 +4425,7 @@ static const NSSItem nss_builtins_items_72 [] = {
+ "\132\052\202\262\067\171"
+ , (PRUint32)646 }
+ };
+-static const NSSItem nss_builtins_items_73 [] = {
++static const NSSItem nss_builtins_items_61 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5233,7 +4450,7 @@ static const NSSItem nss_builtins_items_73 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_74 [] = {
++static const NSSItem nss_builtins_items_62 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5308,7 +4525,7 @@ static const NSSItem nss_builtins_items_74 [] = {
+ "\221\060\352\315"
+ , (PRUint32)804 }
+ };
+-static const NSSItem nss_builtins_items_75 [] = {
++static const NSSItem nss_builtins_items_63 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5332,118 +4549,7 @@ static const NSSItem nss_builtins_items_75 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_76 [] = {
+-  { (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 *)"Visa International Global Root 2", (PRUint32)33 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
+-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
+-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
+-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
+-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
+-"\164\040\062"
+-, (PRUint32)99 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
+-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
+-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
+-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
+-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
+-"\164\040\062"
+-, (PRUint32)99 },
+-  { (void *)"\002\002\003\036"
+-, (PRUint32)4 },
+-  { (void *)"\060\202\003\200\060\202\002\150\240\003\002\001\002\002\002\003"
+-"\036\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000"
+-"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
+-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
+-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
+-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
+-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
+-"\164\040\062\060\036\027\015\060\060\060\070\061\066\062\062\065"
+-"\061\060\060\132\027\015\062\060\060\070\061\065\062\063\065\071"
+-"\060\060\132\060\141\061\013\060\011\006\003\125\004\006\023\002"
+-"\125\123\061\015\060\013\006\003\125\004\012\023\004\126\111\123"
+-"\101\061\057\060\055\006\003\125\004\013\023\046\126\151\163\141"
+-"\040\111\156\164\145\162\156\141\164\151\157\156\141\154\040\123"
+-"\145\162\166\151\143\145\040\101\163\163\157\143\151\141\164\151"
+-"\157\156\061\022\060\020\006\003\125\004\003\023\011\107\120\040"
+-"\122\157\157\164\040\062\060\202\001\042\060\015\006\011\052\206"
+-"\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202"
+-"\001\012\002\202\001\001\000\251\001\160\265\252\304\100\360\253"
+-"\152\046\141\171\031\000\374\277\233\067\131\014\257\157\144\033"
+-"\370\332\225\224\044\151\063\021\160\312\343\126\164\242\027\127"
+-"\144\134\040\006\341\326\357\161\267\073\367\253\301\151\320\111"
+-"\244\261\004\327\364\127\142\211\134\260\165\055\027\044\151\343"
+-"\102\140\344\356\164\326\253\200\126\330\210\050\341\373\155\042"
+-"\375\043\174\106\163\117\176\124\163\036\250\054\125\130\165\267"
+-"\114\363\132\105\245\002\032\372\332\235\303\105\303\042\136\363"
+-"\213\361\140\051\322\307\137\264\014\072\121\203\357\060\370\324"
+-"\347\307\362\372\231\243\042\120\276\371\005\067\243\255\355\232"
+-"\303\346\354\210\033\266\031\047\033\070\213\200\115\354\271\307"
+-"\305\211\313\374\032\062\355\043\360\265\001\130\371\366\217\340"
+-"\205\251\114\011\162\071\022\333\263\365\317\116\142\144\332\306"
+-"\031\025\072\143\035\351\027\125\241\114\042\074\064\062\106\370"
+-"\145\127\272\053\357\066\214\152\372\331\331\104\364\252\335\204"
+-"\327\015\034\262\124\254\062\205\264\144\015\336\101\273\261\064"
+-"\306\001\206\062\144\325\237\002\003\001\000\001\243\102\060\100"
+-"\060\035\006\003\125\035\016\004\026\004\024\236\175\113\064\277"
+-"\161\255\302\005\366\003\165\200\316\251\117\032\304\044\114\060"
+-"\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377"
+-"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006"
+-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003"
+-"\202\001\001\000\041\245\166\024\125\371\255\047\160\217\074\364"
+-"\325\154\310\314\012\253\243\230\013\212\006\043\305\311\141\333"
+-"\231\007\151\065\046\061\376\307\056\204\302\231\141\324\015\351"
+-"\175\056\023\053\174\216\205\266\205\307\113\317\065\266\054\107"
+-"\075\316\051\057\330\157\237\211\034\144\223\277\010\275\166\320"
+-"\220\212\224\263\177\050\133\156\254\115\063\054\355\145\334\026"
+-"\314\342\315\256\244\075\142\222\006\225\046\277\337\271\344\040"
+-"\246\163\152\301\276\367\224\104\326\115\157\052\013\153\030\115"
+-"\164\020\066\150\152\132\301\152\247\335\066\051\214\270\060\213"
+-"\117\041\077\000\056\124\060\007\072\272\212\344\303\236\312\330"
+-"\265\330\173\316\165\105\146\007\364\155\055\330\172\312\351\211"
+-"\212\362\043\330\057\313\156\000\066\117\373\360\057\001\314\017"
+-"\300\042\145\364\253\342\116\141\055\003\202\175\221\026\265\060"
+-"\325\024\336\136\307\220\374\241\374\253\020\257\134\153\160\247"
+-"\007\357\051\206\350\262\045\307\040\377\046\335\167\357\171\104"
+-"\024\304\275\335\073\305\003\233\167\043\354\240\354\273\132\071"
+-"\265\314\255\006"
+-, (PRUint32)900 }
+-};
+-static const NSSItem nss_builtins_items_77 [] = {
+-  { (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 *)"Visa International Global Root 2", (PRUint32)33 },
+-  { (void *)"\311\015\033\352\210\075\247\321\027\276\073\171\364\041\016\032"
+-"\130\224\247\055"
+-, (PRUint32)20 },
+-  { (void *)"\065\110\225\066\112\124\132\162\226\216\340\144\314\357\054\214"
+-, (PRUint32)16 },
+-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
+-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
+-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
+-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
+-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
+-"\164\040\062"
+-, (PRUint32)99 },
+-  { (void *)"\002\002\003\036"
+-, (PRUint32)4 },
+-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+-};
+-static const NSSItem nss_builtins_items_78 [] = {
++static const NSSItem nss_builtins_items_64 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5552,7 +4658,7 @@ static const NSSItem nss_builtins_items_78 [] = {
+ "\043\020\077\041\020\131\267\344\100\335\046\014\043\366\252\256"
+ , (PRUint32)1328 }
+ };
+-static const NSSItem nss_builtins_items_79 [] = {
++static const NSSItem nss_builtins_items_65 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5572,12 +4678,12 @@ static const NSSItem nss_builtins_items_79 [] = {
+ , (PRUint32)92 },
+   { (void *)"\002\004\071\117\175\207"
+ , (PRUint32)6 },
+-  { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_80 [] = {
++static const NSSItem nss_builtins_items_66 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5671,7 +4777,7 @@ static const NSSItem nss_builtins_items_80 [] = {
+ "\065\341\035\026\034\320\274\053\216\326\161\331"
+ , (PRUint32)1052 }
+ };
+-static const NSSItem nss_builtins_items_81 [] = {
++static const NSSItem nss_builtins_items_67 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5697,7 +4803,7 @@ static const NSSItem nss_builtins_items_81 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_82 [] = {
++static const NSSItem nss_builtins_items_68 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5795,7 +4901,7 @@ static const NSSItem nss_builtins_items_82 [] = {
+ "\027\132\173\320\274\307\217\116\206\004"
+ , (PRUint32)1082 }
+ };
+-static const NSSItem nss_builtins_items_83 [] = {
++static const NSSItem nss_builtins_items_69 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5822,7 +4928,7 @@ static const NSSItem nss_builtins_items_83 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_84 [] = {
++static const NSSItem nss_builtins_items_70 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5916,7 +5022,7 @@ static const NSSItem nss_builtins_items_84 [] = {
+ "\116\072\063\014\053\263\055\220\006"
+ , (PRUint32)1049 }
+ };
+-static const NSSItem nss_builtins_items_85 [] = {
++static const NSSItem nss_builtins_items_71 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -5942,7 +5048,7 @@ static const NSSItem nss_builtins_items_85 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_86 [] = {
++static const NSSItem nss_builtins_items_72 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6037,7 +5143,7 @@ static const NSSItem nss_builtins_items_86 [] = {
+ "\306\241"
+ , (PRUint32)1058 }
+ };
+-static const NSSItem nss_builtins_items_87 [] = {
++static const NSSItem nss_builtins_items_73 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6063,141 +5169,7 @@ static const NSSItem nss_builtins_items_87 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_88 [] = {
+-  { (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 *)"Verisign Time Stamping Authority CA", (PRUint32)36 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\201\245\061\027\060\025\006\003\125\004\012\023\016\126\145"
+-"\162\151\123\151\147\156\054\040\111\156\143\056\061\037\060\035"
+-"\006\003\125\004\013\023\026\126\145\162\151\123\151\147\156\040"
+-"\124\162\165\163\164\040\116\145\164\167\157\162\153\061\073\060"
+-"\071\006\003\125\004\013\023\062\124\145\162\155\163\040\157\146"
+-"\040\165\163\145\040\141\164\040\150\164\164\160\163\072\057\057"
+-"\167\167\167\056\166\145\162\151\163\151\147\156\056\143\157\155"
+-"\057\162\160\141\040\050\143\051\060\060\061\054\060\052\006\003"
+-"\125\004\003\023\043\126\145\162\151\123\151\147\156\040\124\151"
+-"\155\145\040\123\164\141\155\160\151\156\147\040\101\165\164\150"
+-"\157\162\151\164\171\040\103\101"
+-, (PRUint32)168 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123"
+-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123"
+-"\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125"
+-"\004\013\023\063\103\154\141\163\163\040\063\040\120\165\142\154"
+-"\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151"
+-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
+-"\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013"
+-"\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123"
+-"\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040"
+-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157"
+-"\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145"
+-"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
+-"\167\157\162\153"
+-, (PRUint32)196 },
+-  { (void *)"\002\020\123\141\262\140\256\333\161\216\247\224\263\023\063\364"
+-"\007\011"
+-, (PRUint32)18 },
+-  { (void *)"\060\202\003\315\060\202\003\066\240\003\002\001\002\002\020\123"
+-"\141\262\140\256\333\161\216\247\224\263\023\063\364\007\011\060"
+-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
+-"\301\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027"
+-"\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147"
+-"\156\054\040\111\156\143\056\061\074\060\072\006\003\125\004\013"
+-"\023\063\103\154\141\163\163\040\063\040\120\165\142\154\151\143"
+-"\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151"
+-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+-"\040\055\040\107\062\061\072\060\070\006\003\125\004\013\023\061"
+-"\050\143\051\040\061\071\071\070\040\126\145\162\151\123\151\147"
+-"\156\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165"
+-"\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154"
+-"\171\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151"
+-"\123\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157"
+-"\162\153\060\036\027\015\060\060\060\071\062\066\060\060\060\060"
+-"\060\060\132\027\015\061\060\060\071\062\065\062\063\065\071\065"
+-"\071\132\060\201\245\061\027\060\025\006\003\125\004\012\023\016"
+-"\126\145\162\151\123\151\147\156\054\040\111\156\143\056\061\037"
+-"\060\035\006\003\125\004\013\023\026\126\145\162\151\123\151\147"
+-"\156\040\124\162\165\163\164\040\116\145\164\167\157\162\153\061"
+-"\073\060\071\006\003\125\004\013\023\062\124\145\162\155\163\040"
+-"\157\146\040\165\163\145\040\141\164\040\150\164\164\160\163\072"
+-"\057\057\167\167\167\056\166\145\162\151\163\151\147\156\056\143"
+-"\157\155\057\162\160\141\040\050\143\051\060\060\061\054\060\052"
+-"\006\003\125\004\003\023\043\126\145\162\151\123\151\147\156\040"
+-"\124\151\155\145\040\123\164\141\155\160\151\156\147\040\101\165"
+-"\164\150\157\162\151\164\171\040\103\101\060\201\237\060\015\006"
+-"\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215\000"
+-"\060\201\211\002\201\201\000\322\031\235\147\302\000\041\131\142"
+-"\316\264\011\042\104\151\212\370\045\132\333\355\015\267\066\176"
+-"\116\340\273\224\076\220\045\207\302\141\107\051\331\275\124\270"
+-"\143\314\054\175\151\264\063\066\364\067\007\232\301\335\100\124"
+-"\374\340\170\235\240\223\271\011\075\043\121\177\104\302\024\164"
+-"\333\012\276\313\311\060\064\100\230\076\320\327\045\020\201\224"
+-"\275\007\117\234\326\124\047\337\056\250\277\313\220\214\215\165"
+-"\113\274\342\350\104\207\315\346\101\012\045\156\350\364\044\002"
+-"\305\122\017\156\354\230\165\002\003\001\000\001\243\201\337\060"
+-"\201\334\060\017\006\003\125\035\023\004\010\060\006\001\001\377"
+-"\002\001\000\060\105\006\003\125\035\040\004\076\060\074\060\072"
+-"\006\014\140\206\110\001\206\370\105\001\007\027\001\003\060\052"
+-"\060\050\006\010\053\006\001\005\005\007\002\001\026\034\150\164"
+-"\164\160\163\072\057\057\167\167\167\056\166\145\162\151\163\151"
+-"\147\156\056\143\157\155\057\162\160\141\060\061\006\003\125\035"
+-"\037\004\052\060\050\060\046\240\044\240\042\206\040\150\164\164"
+-"\160\072\057\057\143\162\154\056\166\145\162\151\163\151\147\156"
+-"\056\143\157\155\057\160\143\141\063\056\143\162\154\060\013\006"
+-"\003\125\035\017\004\004\003\002\001\006\060\102\006\010\053\006"
+-"\001\005\005\007\001\001\004\066\060\064\060\062\006\010\053\006"
+-"\001\005\005\007\060\001\246\046\026\044\150\164\164\160\072\057"
+-"\057\157\143\163\160\056\166\145\162\151\163\151\147\156\056\143"
+-"\157\155\057\157\143\163\160\057\163\164\141\164\165\163\060\015"
+-"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201"
+-"\000\202\160\150\225\337\266\015\302\001\160\031\112\322\124\126"
+-"\036\254\362\105\114\207\270\365\065\353\170\113\005\251\310\235"
+-"\073\031\041\056\160\064\112\242\365\211\340\025\165\105\347\050"
+-"\067\000\064\047\051\350\067\113\362\357\104\227\153\027\121\032"
+-"\303\126\235\074\032\212\366\112\106\106\067\214\372\313\365\144"
+-"\132\070\150\056\034\303\357\160\316\270\106\006\026\277\367\176"
+-"\347\265\250\076\105\254\251\045\165\042\173\157\077\260\234\224"
+-"\347\307\163\253\254\037\356\045\233\300\026\355\267\312\133\360"
+-"\024"
+-, (PRUint32)977 }
+-};
+-static const NSSItem nss_builtins_items_89 [] = {
+-  { (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 *)"Verisign Time Stamping Authority CA", (PRUint32)36 },
+-  { (void *)"\246\017\064\310\142\154\201\366\213\367\175\251\366\147\130\212"
+-"\220\077\175\066"
+-, (PRUint32)20 },
+-  { (void *)"\211\111\124\214\310\150\232\203\051\354\334\006\163\041\253\227"
+-, (PRUint32)16 },
+-  { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123"
+-"\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123"
+-"\151\147\156\054\040\111\156\143\056\061\074\060\072\006\003\125"
+-"\004\013\023\063\103\154\141\163\163\040\063\040\120\165\142\154"
+-"\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151"
+-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
+-"\164\171\040\055\040\107\062\061\072\060\070\006\003\125\004\013"
+-"\023\061\050\143\051\040\061\071\071\070\040\126\145\162\151\123"
+-"\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162\040"
+-"\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157"
+-"\156\154\171\061\037\060\035\006\003\125\004\013\023\026\126\145"
+-"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
+-"\167\157\162\153"
+-, (PRUint32)196 },
+-  { (void *)"\002\020\123\141\262\140\256\333\161\216\247\224\263\023\063\364"
+-"\007\011"
+-, (PRUint32)18 },
+-  { (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_90 [] = {
++static const NSSItem nss_builtins_items_74 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6272,7 +5244,7 @@ static const NSSItem nss_builtins_items_90 [] = {
+ "\011\254\211\111\323"
+ , (PRUint32)677 }
+ };
+-static const NSSItem nss_builtins_items_91 [] = {
++static const NSSItem nss_builtins_items_75 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6300,7 +5272,7 @@ static const NSSItem nss_builtins_items_91 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_92 [] = {
++static const NSSItem nss_builtins_items_76 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6412,7 +5384,7 @@ static const NSSItem nss_builtins_items_92 [] = {
+ "\005\377\154\211\063\360\354\025\017"
+ , (PRUint32)1177 }
+ };
+-static const NSSItem nss_builtins_items_93 [] = {
++static const NSSItem nss_builtins_items_77 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6438,12 +5410,12 @@ static const NSSItem nss_builtins_items_93 [] = {
+ , (PRUint32)189 },
+   { (void *)"\002\004\070\233\021\074"
+ , (PRUint32)6 },
+-  { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_94 [] = {
++static const NSSItem nss_builtins_items_78 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6554,7 +5526,7 @@ static const NSSItem nss_builtins_items_94 [] = {
+ "\316\145\146\227\256\046\136"
+ , (PRUint32)1159 }
+ };
+-static const NSSItem nss_builtins_items_95 [] = {
++static const NSSItem nss_builtins_items_79 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6580,12 +5552,12 @@ static const NSSItem nss_builtins_items_95 [] = {
+ , (PRUint32)183 },
+   { (void *)"\002\004\070\236\366\344"
+ , (PRUint32)6 },
+-  { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_96 [] = {
++static const NSSItem nss_builtins_items_80 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6697,7 +5669,7 @@ static const NSSItem nss_builtins_items_96 [] = {
+ "\036\177\132\264\074"
+ , (PRUint32)1173 }
+ };
+-static const NSSItem nss_builtins_items_97 [] = {
++static const NSSItem nss_builtins_items_81 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6728,7 +5700,7 @@ static const NSSItem nss_builtins_items_97 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_98 [] = {
++static const NSSItem nss_builtins_items_82 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6823,7 +5795,7 @@ static const NSSItem nss_builtins_items_98 [] = {
+ "\071\050\150\016\163\335\045\232\336\022"
+ , (PRUint32)1002 }
+ };
+-static const NSSItem nss_builtins_items_99 [] = {
++static const NSSItem nss_builtins_items_83 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6851,7 +5823,7 @@ static const NSSItem nss_builtins_items_99 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_100 [] = {
++static const NSSItem nss_builtins_items_84 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -6978,7 +5950,7 @@ static const NSSItem nss_builtins_items_100 [] = {
+ "\204\327\372\334\162\133\367\301\072\150"
+ , (PRUint32)1514 }
+ };
+-static const NSSItem nss_builtins_items_101 [] = {
++static const NSSItem nss_builtins_items_85 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7006,7 +5978,7 @@ static const NSSItem nss_builtins_items_101 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_102 [] = {
++static const NSSItem nss_builtins_items_86 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7121,7 +6093,7 @@ static const NSSItem nss_builtins_items_102 [] = {
+ "\061\210\027\120\237\311\304\016\213\330\250\002\143\015"
+ , (PRUint32)1390 }
+ };
+-static const NSSItem nss_builtins_items_103 [] = {
++static const NSSItem nss_builtins_items_87 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7142,12 +6114,12 @@ static const NSSItem nss_builtins_items_103 [] = {
+ , (PRUint32)104 },
+   { (void *)"\002\004\074\265\075\106"
+ , (PRUint32)6 },
+-  { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_104 [] = {
++static const NSSItem nss_builtins_items_88 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7277,7 +6249,7 @@ static const NSSItem nss_builtins_items_104 [] = {
+ "\254\142\127\251\367"
+ , (PRUint32)1621 }
+ };
+-static const NSSItem nss_builtins_items_105 [] = {
++static const NSSItem nss_builtins_items_89 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7298,12 +6270,12 @@ static const NSSItem nss_builtins_items_105 [] = {
+ , (PRUint32)104 },
+   { (void *)"\002\004\074\265\117\100"
+ , (PRUint32)6 },
+-  { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_106 [] = {
++static const NSSItem nss_builtins_items_90 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7419,7 +6391,7 @@ static const NSSItem nss_builtins_items_106 [] = {
+ "\230\150\373\001\103\326\033\342\011\261\227\034"
+ , (PRUint32)1388 }
+ };
+-static const NSSItem nss_builtins_items_107 [] = {
++static const NSSItem nss_builtins_items_91 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7441,12 +6413,12 @@ static const NSSItem nss_builtins_items_107 [] = {
+   { (void *)"\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264"
+ "\252\032"
+ , (PRUint32)18 },
+-  { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_108 [] = {
++static const NSSItem nss_builtins_items_92 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7524,7 +6496,7 @@ static const NSSItem nss_builtins_items_108 [] = {
+ "\354\040\005\141\336"
+ , (PRUint32)869 }
+ };
+-static const NSSItem nss_builtins_items_109 [] = {
++static const NSSItem nss_builtins_items_93 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7548,92 +6520,7 @@ static const NSSItem nss_builtins_items_109 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_110 [] = {
+-  { (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 *)"RSA Security 1024 v3", (PRUint32)21 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101"
+-"\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060"
+-"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165"
+-"\162\151\164\171\040\061\060\062\064\040\126\063"
+-, (PRUint32)60 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101"
+-"\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060"
+-"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165"
+-"\162\151\164\171\040\061\060\062\064\040\126\063"
+-, (PRUint32)60 },
+-  { (void *)"\002\020\012\001\001\001\000\000\002\174\000\000\000\013\000\000"
+-"\000\002"
+-, (PRUint32)18 },
+-  { (void *)"\060\202\002\134\060\202\001\305\240\003\002\001\002\002\020\012"
+-"\001\001\001\000\000\002\174\000\000\000\013\000\000\000\002\060"
+-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\072"
+-"\061\031\060\027\006\003\125\004\012\023\020\122\123\101\040\123"
+-"\145\143\165\162\151\164\171\040\111\156\143\061\035\060\033\006"
+-"\003\125\004\013\023\024\122\123\101\040\123\145\143\165\162\151"
+-"\164\171\040\061\060\062\064\040\126\063\060\036\027\015\060\061"
+-"\060\062\062\062\062\061\060\061\064\071\132\027\015\062\066\060"
+-"\062\062\062\062\060\060\061\064\071\132\060\072\061\031\060\027"
+-"\006\003\125\004\012\023\020\122\123\101\040\123\145\143\165\162"
+-"\151\164\171\040\111\156\143\061\035\060\033\006\003\125\004\013"
+-"\023\024\122\123\101\040\123\145\143\165\162\151\164\171\040\061"
+-"\060\062\064\040\126\063\060\201\237\060\015\006\011\052\206\110"
+-"\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211\002"
+-"\201\201\000\325\335\376\146\011\317\044\074\076\256\201\116\116"
+-"\212\304\151\200\133\131\073\337\271\115\114\312\265\055\303\047"
+-"\055\074\257\000\102\155\274\050\246\226\317\177\327\130\254\203"
+-"\012\243\125\265\173\027\220\025\204\114\212\356\046\231\334\130"
+-"\357\307\070\246\252\257\320\216\102\310\142\327\253\254\251\373"
+-"\112\175\277\352\376\022\115\335\377\046\055\157\066\124\150\310"
+-"\322\204\126\356\222\123\141\011\263\077\071\233\250\311\233\275"
+-"\316\237\176\324\031\152\026\051\030\276\327\072\151\334\045\133"
+-"\063\032\121\002\003\001\000\001\243\143\060\141\060\017\006\003"
+-"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006"
+-"\003\125\035\017\001\001\377\004\004\003\002\001\006\060\037\006"
+-"\003\125\035\043\004\030\060\026\200\024\304\300\034\244\007\224"
+-"\375\315\115\001\324\124\332\245\014\137\336\256\005\132\060\035"
+-"\006\003\125\035\016\004\026\004\024\304\300\034\244\007\224\375"
+-"\315\115\001\324\124\332\245\014\137\336\256\005\132\060\015\006"
+-"\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000"
+-"\077\055\152\343\046\103\225\175\211\227\145\373\165\344\162\035"
+-"\106\127\304\141\153\151\237\022\233\054\325\132\350\300\242\360"
+-"\103\225\343\037\351\166\315\334\353\274\223\240\145\012\307\115"
+-"\117\137\247\257\242\106\024\271\014\363\314\275\152\156\267\235"
+-"\336\045\102\320\124\377\236\150\163\143\334\044\353\042\277\250"
+-"\162\362\136\000\341\015\116\072\103\156\231\116\077\211\170\003"
+-"\230\312\363\125\314\235\256\216\301\252\105\230\372\217\032\240"
+-"\215\210\043\361\025\101\015\245\106\076\221\077\213\353\367\161"
+-, (PRUint32)608 }
+-};
+-static const NSSItem nss_builtins_items_111 [] = {
+-  { (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 *)"RSA Security 1024 v3", (PRUint32)21 },
+-  { (void *)"\074\273\135\340\374\326\071\174\005\210\345\146\227\275\106\052"
+-"\275\371\134\166"
+-, (PRUint32)20 },
+-  { (void *)"\072\345\120\260\071\276\307\106\066\063\241\376\202\076\215\224"
+-, (PRUint32)16 },
+-  { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101"
+-"\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060"
+-"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165"
+-"\162\151\164\171\040\061\060\062\064\040\126\063"
+-, (PRUint32)60 },
+-  { (void *)"\002\020\012\001\001\001\000\000\002\174\000\000\000\013\000\000"
+-"\000\002"
+-, (PRUint32)18 },
+-  { (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_112 [] = {
++static const NSSItem nss_builtins_items_94 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7711,7 +6598,7 @@ static const NSSItem nss_builtins_items_112 [] = {
+ "\302\005\146\200\241\313\346\063"
+ , (PRUint32)856 }
+ };
+-static const NSSItem nss_builtins_items_113 [] = {
++static const NSSItem nss_builtins_items_95 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7735,7 +6622,7 @@ static const NSSItem nss_builtins_items_113 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_114 [] = {
++static const NSSItem nss_builtins_items_96 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7814,7 +6701,7 @@ static const NSSItem nss_builtins_items_114 [] = {
+ "\342\042\051\256\175\203\100\250\272\154"
+ , (PRUint32)874 }
+ };
+-static const NSSItem nss_builtins_items_115 [] = {
++static const NSSItem nss_builtins_items_97 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7838,7 +6725,7 @@ static const NSSItem nss_builtins_items_115 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_116 [] = {
++static const NSSItem nss_builtins_items_98 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7949,7 +6836,7 @@ static const NSSItem nss_builtins_items_116 [] = {
+ "\244\346\216\330\371\051\110\212\316\163\376\054"
+ , (PRUint32)1388 }
+ };
+-static const NSSItem nss_builtins_items_117 [] = {
++static const NSSItem nss_builtins_items_99 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -7973,7 +6860,7 @@ static const NSSItem nss_builtins_items_117 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_118 [] = {
++static const NSSItem nss_builtins_items_100 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8084,7 +6971,7 @@ static const NSSItem nss_builtins_items_118 [] = {
+ "\362\034\054\176\256\002\026\322\126\320\057\127\123\107\350\222"
+ , (PRUint32)1392 }
+ };
+-static const NSSItem nss_builtins_items_119 [] = {
++static const NSSItem nss_builtins_items_101 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8108,7 +6995,7 @@ static const NSSItem nss_builtins_items_119 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_120 [] = {
++static const NSSItem nss_builtins_items_102 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8216,7 +7103,7 @@ static const NSSItem nss_builtins_items_120 [] = {
+ "\152\372\246\070\254\037\304\204"
+ , (PRUint32)1128 }
+ };
+-static const NSSItem nss_builtins_items_121 [] = {
++static const NSSItem nss_builtins_items_103 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8242,12 +7129,12 @@ static const NSSItem nss_builtins_items_121 [] = {
+   { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300"
+ "\063\167"
+ , (PRUint32)18 },
+-  { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_122 [] = {
++static const NSSItem nss_builtins_items_104 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8334,7 +7221,7 @@ static const NSSItem nss_builtins_items_122 [] = {
+ "\200\072\231\355\165\314\106\173"
+ , (PRUint32)936 }
+ };
+-static const NSSItem nss_builtins_items_123 [] = {
++static const NSSItem nss_builtins_items_105 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8360,7 +7247,7 @@ static const NSSItem nss_builtins_items_123 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_124 [] = {
++static const NSSItem nss_builtins_items_106 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8479,7 +7366,7 @@ static const NSSItem nss_builtins_items_124 [] = {
+ "\105\217\046\221\242\216\376\251"
+ , (PRUint32)1448 }
+ };
+-static const NSSItem nss_builtins_items_125 [] = {
++static const NSSItem nss_builtins_items_107 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8505,7 +7392,7 @@ static const NSSItem nss_builtins_items_125 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_126 [] = {
++static const NSSItem nss_builtins_items_108 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8593,7 +7480,7 @@ static const NSSItem nss_builtins_items_126 [] = {
+ "\222\340\134\366\007\017"
+ , (PRUint32)934 }
+ };
+-static const NSSItem nss_builtins_items_127 [] = {
++static const NSSItem nss_builtins_items_109 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8620,7 +7507,7 @@ static const NSSItem nss_builtins_items_127 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_128 [] = {
++static const NSSItem nss_builtins_items_110 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8712,7 +7599,7 @@ static const NSSItem nss_builtins_items_128 [] = {
+ "\367\115\146\177\247\360\034\001\046\170\262\146\107\160\121\144"
+ , (PRUint32)864 }
+ };
+-static const NSSItem nss_builtins_items_129 [] = {
++static const NSSItem nss_builtins_items_111 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8743,7 +7630,7 @@ static const NSSItem nss_builtins_items_129 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_130 [] = {
++static const NSSItem nss_builtins_items_112 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8835,7 +7722,7 @@ static const NSSItem nss_builtins_items_130 [] = {
+ "\030\122\051\213\107\064\022\011\324\273\222\065\357\017\333\064"
+ , (PRUint32)864 }
+ };
+-static const NSSItem nss_builtins_items_131 [] = {
++static const NSSItem nss_builtins_items_113 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8866,7 +7753,7 @@ static const NSSItem nss_builtins_items_131 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_132 [] = {
++static const NSSItem nss_builtins_items_114 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8937,7 +7824,7 @@ static const NSSItem nss_builtins_items_132 [] = {
+ "\350\140\052\233\205\112\100\363\153\212\044\354\006\026\054\163"
+ , (PRUint32)784 }
+ };
+-static const NSSItem nss_builtins_items_133 [] = {
++static const NSSItem nss_builtins_items_115 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -8960,7 +7847,7 @@ static const NSSItem nss_builtins_items_133 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_134 [] = {
++static const NSSItem nss_builtins_items_116 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9058,7 +7945,7 @@ static const NSSItem nss_builtins_items_134 [] = {
+ "\225\351\066\226\230\156"
+ , (PRUint32)1078 }
+ };
+-static const NSSItem nss_builtins_items_135 [] = {
++static const NSSItem nss_builtins_items_117 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9085,7 +7972,7 @@ static const NSSItem nss_builtins_items_135 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_136 [] = {
++static const NSSItem nss_builtins_items_118 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9184,7 +8071,7 @@ static const NSSItem nss_builtins_items_136 [] = {
+ "\354\375\051"
+ , (PRUint32)1091 }
+ };
+-static const NSSItem nss_builtins_items_137 [] = {
++static const NSSItem nss_builtins_items_119 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9211,7 +8098,7 @@ static const NSSItem nss_builtins_items_137 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_138 [] = {
++static const NSSItem nss_builtins_items_120 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9312,7 +8199,7 @@ static const NSSItem nss_builtins_items_138 [] = {
+ "\160\136\310\304\170\260\142"
+ , (PRUint32)1095 }
+ };
+-static const NSSItem nss_builtins_items_139 [] = {
++static const NSSItem nss_builtins_items_121 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9340,7 +8227,7 @@ static const NSSItem nss_builtins_items_139 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_140 [] = {
++static const NSSItem nss_builtins_items_122 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9518,7 +8405,7 @@ static const NSSItem nss_builtins_items_140 [] = {
+ "\001\177\046\304\143\365\045\102\136\142\275"
+ , (PRUint32)2043 }
+ };
+-static const NSSItem nss_builtins_items_141 [] = {
++static const NSSItem nss_builtins_items_123 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9550,12 +8437,12 @@ static const NSSItem nss_builtins_items_141 [] = {
+ , (PRUint32)288 },
+   { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_142 [] = {
++static const NSSItem nss_builtins_items_124 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9732,7 +8619,7 @@ static const NSSItem nss_builtins_items_142 [] = {
+ "\206\063\076\346\057\110\156\257\124\220\116\255\261\045"
+ , (PRUint32)2030 }
+ };
+-static const NSSItem nss_builtins_items_143 [] = {
++static const NSSItem nss_builtins_items_125 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9764,12 +8651,12 @@ static const NSSItem nss_builtins_items_143 [] = {
+ , (PRUint32)278 },
+   { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_144 [] = {
++static const NSSItem nss_builtins_items_126 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9946,7 +8833,7 @@ static const NSSItem nss_builtins_items_144 [] = {
+ "\257\175\310\352\351\324\126\331\016\023\262\305\105\120"
+ , (PRUint32)2030 }
+ };
+-static const NSSItem nss_builtins_items_145 [] = {
++static const NSSItem nss_builtins_items_127 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -9978,12 +8865,12 @@ static const NSSItem nss_builtins_items_145 [] = {
+ , (PRUint32)278 },
+   { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_146 [] = {
++static const NSSItem nss_builtins_items_128 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -10161,7 +9048,7 @@ static const NSSItem nss_builtins_items_146 [] = {
+ "\336\007\043\162\346\275\040\024\113\264\206"
+ , (PRUint32)2043 }
+ };
+-static const NSSItem nss_builtins_items_147 [] = {
++static const NSSItem nss_builtins_items_129 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -10193,12 +9080,12 @@ static const NSSItem nss_builtins_items_147 [] = {
+ , (PRUint32)280 },
+   { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_148 [] = {
++static const NSSItem nss_builtins_items_130 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -10376,7 +9263,7 @@ static const NSSItem nss_builtins_items_148 [] = {
+ "\311\024\025\014\343\007\203\233\046\165\357"
+ , (PRUint32)2043 }
+ };
+-static const NSSItem nss_builtins_items_149 [] = {
++static const NSSItem nss_builtins_items_131 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -10408,122 +9295,12 @@ static const NSSItem nss_builtins_items_149 [] = {
+ , (PRUint32)280 },
+   { (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_150 [] = {
+-  { (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 *)"IPS Servidores root", (PRUint32)20 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\201\243\061\013\060\011\006\003\125\004\006\023\002\105\123"
+-"\061\022\060\020\006\003\125\004\010\023\011\102\101\122\103\105"
+-"\114\117\116\101\061\022\060\020\006\003\125\004\007\023\011\102"
+-"\101\122\103\105\114\117\116\101\061\031\060\027\006\003\125\004"
+-"\012\023\020\111\120\123\040\123\145\147\165\162\151\144\141\144"
+-"\040\103\101\061\030\060\026\006\003\125\004\013\023\017\103\145"
+-"\162\164\151\146\151\143\141\143\151\157\156\145\163\061\027\060"
+-"\025\006\003\125\004\003\023\016\111\120\123\040\123\105\122\126"
+-"\111\104\117\122\105\123\061\036\060\034\006\011\052\206\110\206"
+-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+-"\151\160\163\056\145\163"
+-, (PRUint32)166 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\201\243\061\013\060\011\006\003\125\004\006\023\002\105\123"
+-"\061\022\060\020\006\003\125\004\010\023\011\102\101\122\103\105"
+-"\114\117\116\101\061\022\060\020\006\003\125\004\007\023\011\102"
+-"\101\122\103\105\114\117\116\101\061\031\060\027\006\003\125\004"
+-"\012\023\020\111\120\123\040\123\145\147\165\162\151\144\141\144"
+-"\040\103\101\061\030\060\026\006\003\125\004\013\023\017\103\145"
+-"\162\164\151\146\151\143\141\143\151\157\156\145\163\061\027\060"
+-"\025\006\003\125\004\003\023\016\111\120\123\040\123\105\122\126"
+-"\111\104\117\122\105\123\061\036\060\034\006\011\052\206\110\206"
+-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+-"\151\160\163\056\145\163"
+-, (PRUint32)166 },
+-  { (void *)"\002\001\000"
+-, (PRUint32)3 },
+-  { (void *)"\060\202\002\267\060\202\002\040\002\001\000\060\015\006\011\052"
+-"\206\110\206\367\015\001\001\004\005\000\060\201\243\061\013\060"
+-"\011\006\003\125\004\006\023\002\105\123\061\022\060\020\006\003"
+-"\125\004\010\023\011\102\101\122\103\105\114\117\116\101\061\022"
+-"\060\020\006\003\125\004\007\023\011\102\101\122\103\105\114\117"
+-"\116\101\061\031\060\027\006\003\125\004\012\023\020\111\120\123"
+-"\040\123\145\147\165\162\151\144\141\144\040\103\101\061\030\060"
+-"\026\006\003\125\004\013\023\017\103\145\162\164\151\146\151\143"
+-"\141\143\151\157\156\145\163\061\027\060\025\006\003\125\004\003"
+-"\023\016\111\120\123\040\123\105\122\126\111\104\117\122\105\123"
+-"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
+-"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
+-"\060\036\027\015\071\070\060\061\060\061\062\063\062\061\060\067"
+-"\132\027\015\060\071\061\062\062\071\062\063\062\061\060\067\132"
+-"\060\201\243\061\013\060\011\006\003\125\004\006\023\002\105\123"
+-"\061\022\060\020\006\003\125\004\010\023\011\102\101\122\103\105"
+-"\114\117\116\101\061\022\060\020\006\003\125\004\007\023\011\102"
+-"\101\122\103\105\114\117\116\101\061\031\060\027\006\003\125\004"
+-"\012\023\020\111\120\123\040\123\145\147\165\162\151\144\141\144"
+-"\040\103\101\061\030\060\026\006\003\125\004\013\023\017\103\145"
+-"\162\164\151\146\151\143\141\143\151\157\156\145\163\061\027\060"
+-"\025\006\003\125\004\003\023\016\111\120\123\040\123\105\122\126"
+-"\111\104\117\122\105\123\061\036\060\034\006\011\052\206\110\206"
+-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+-"\151\160\163\056\145\163\060\201\237\060\015\006\011\052\206\110"
+-"\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211\002"
+-"\201\201\000\254\117\122\164\237\071\352\216\334\045\304\274\230"
+-"\135\230\144\044\011\074\041\263\314\031\265\216\224\216\207\321"
+-"\370\067\076\241\310\055\130\244\200\065\133\241\165\154\035\105"
+-"\014\037\141\143\152\136\157\233\012\114\301\310\270\141\043\065"
+-"\201\377\376\254\170\160\055\150\341\072\007\230\225\002\124\335"
+-"\315\043\267\200\123\327\310\067\105\162\006\044\022\272\023\141"
+-"\041\212\156\165\050\340\305\017\064\375\066\330\105\177\341\270"
+-"\066\357\263\341\306\040\216\350\264\070\274\341\076\366\021\336"
+-"\214\235\001\002\003\001\000\001\060\015\006\011\052\206\110\206"
+-"\367\015\001\001\004\005\000\003\201\201\000\054\363\303\171\130"
+-"\044\336\306\073\321\340\102\151\270\356\144\263\075\142\001\271"
+-"\263\204\337\043\175\335\230\317\020\251\376\000\330\042\226\005"
+-"\023\007\124\127\305\247\336\313\331\270\210\102\366\231\333\024"
+-"\167\037\266\376\045\075\341\242\076\003\251\201\322\055\154\107"
+-"\365\226\106\214\042\253\310\314\015\016\227\136\213\101\264\073"
+-"\304\012\006\100\035\335\106\364\001\335\272\202\056\074\075\170"
+-"\160\236\174\030\320\253\370\270\167\007\106\161\361\312\013\143"
+-"\134\152\371\162\224\325\001\117\240\333\102"
+-, (PRUint32)699 }
+-};
+-static const NSSItem nss_builtins_items_151 [] = {
+-  { (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 *)"IPS Servidores root", (PRUint32)20 },
+-  { (void *)"\044\272\155\154\212\133\130\067\244\215\265\372\351\031\352\147"
+-"\134\224\322\027"
+-, (PRUint32)20 },
+-  { (void *)"\173\265\010\231\232\214\030\277\205\047\175\016\256\332\262\253"
+-, (PRUint32)16 },
+-  { (void *)"\060\201\243\061\013\060\011\006\003\125\004\006\023\002\105\123"
+-"\061\022\060\020\006\003\125\004\010\023\011\102\101\122\103\105"
+-"\114\117\116\101\061\022\060\020\006\003\125\004\007\023\011\102"
+-"\101\122\103\105\114\117\116\101\061\031\060\027\006\003\125\004"
+-"\012\023\020\111\120\123\040\123\145\147\165\162\151\144\141\144"
+-"\040\103\101\061\030\060\026\006\003\125\004\013\023\017\103\145"
+-"\162\164\151\146\151\143\141\143\151\157\156\145\163\061\027\060"
+-"\025\006\003\125\004\003\023\016\111\120\123\040\123\105\122\126"
+-"\111\104\117\122\105\123\061\036\060\034\006\011\052\206\110\206"
+-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+-"\151\160\163\056\145\163"
+-, (PRUint32)166 },
+-  { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_152 [] = {
++static const NSSItem nss_builtins_items_132 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -10707,7 +9484,7 @@ static const NSSItem nss_builtins_items_152 [] = {
+ "\207\112\137\334\357\351\126\360\012\014\350\165"
+ , (PRUint32)2108 }
+ };
+-static const NSSItem nss_builtins_items_153 [] = {
++static const NSSItem nss_builtins_items_133 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -10740,12 +9517,12 @@ static const NSSItem nss_builtins_items_153 [] = {
+ , (PRUint32)290 },
+   { (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 *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_154 [] = {
++static const NSSItem nss_builtins_items_134 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -10871,7 +9648,7 @@ static const NSSItem nss_builtins_items_154 [] = {
+ "\112\164\066\371"
+ , (PRUint32)1492 }
+ };
+-static const NSSItem nss_builtins_items_155 [] = {
++static const NSSItem nss_builtins_items_135 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -10899,7 +9676,7 @@ static const NSSItem nss_builtins_items_155 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_156 [] = {
++static const NSSItem nss_builtins_items_136 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11015,7 +9792,7 @@ static const NSSItem nss_builtins_items_156 [] = {
+ "\020\005\145\325\202\020\352\302\061\315\056"
+ , (PRUint32)1467 }
+ };
+-static const NSSItem nss_builtins_items_157 [] = {
++static const NSSItem nss_builtins_items_137 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11039,7 +9816,7 @@ static const NSSItem nss_builtins_items_157 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_158 [] = {
++static const NSSItem nss_builtins_items_138 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11170,7 +9947,7 @@ static const NSSItem nss_builtins_items_158 [] = {
+ "\332"
+ , (PRUint32)1697 }
+ };
+-static const NSSItem nss_builtins_items_159 [] = {
++static const NSSItem nss_builtins_items_139 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11194,7 +9971,7 @@ static const NSSItem nss_builtins_items_159 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_160 [] = {
++static const NSSItem nss_builtins_items_140 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11274,7 +10051,7 @@ static const NSSItem nss_builtins_items_160 [] = {
+ "\057\317\246\356\311\160\042\024\275\375\276\154\013\003"
+ , (PRUint32)862 }
+ };
+-static const NSSItem nss_builtins_items_161 [] = {
++static const NSSItem nss_builtins_items_141 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11299,7 +10076,7 @@ static const NSSItem nss_builtins_items_161 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_162 [] = {
++static const NSSItem nss_builtins_items_142 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11372,7 +10149,7 @@ static const NSSItem nss_builtins_items_162 [] = {
+ "\127\275\125\232"
+ , (PRUint32)804 }
+ };
+-static const NSSItem nss_builtins_items_163 [] = {
++static const NSSItem nss_builtins_items_143 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11395,7 +10172,7 @@ static const NSSItem nss_builtins_items_163 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_164 [] = {
++static const NSSItem nss_builtins_items_144 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11468,7 +10245,7 @@ static const NSSItem nss_builtins_items_164 [] = {
+ "\160\254\337\114"
+ , (PRUint32)804 }
+ };
+-static const NSSItem nss_builtins_items_165 [] = {
++static const NSSItem nss_builtins_items_145 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11491,7 +10268,7 @@ static const NSSItem nss_builtins_items_165 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_166 [] = {
++static const NSSItem nss_builtins_items_146 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11577,7 +10354,7 @@ static const NSSItem nss_builtins_items_166 [] = {
+ "\025\301\044\174\062\174\003\035\073\241\130\105\062\223"
+ , (PRUint32)958 }
+ };
+-static const NSSItem nss_builtins_items_167 [] = {
++static const NSSItem nss_builtins_items_147 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11602,7 +10379,7 @@ static const NSSItem nss_builtins_items_167 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_168 [] = {
++static const NSSItem nss_builtins_items_148 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11693,7 +10470,7 @@ static const NSSItem nss_builtins_items_168 [] = {
+ "\151\003\142\270\231\005\005\075\153\170\022\275\260\157\145"
+ , (PRUint32)1071 }
+ };
+-static const NSSItem nss_builtins_items_169 [] = {
++static const NSSItem nss_builtins_items_149 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11717,7 +10494,7 @@ static const NSSItem nss_builtins_items_169 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_170 [] = {
++static const NSSItem nss_builtins_items_150 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11821,7 +10598,7 @@ static const NSSItem nss_builtins_items_170 [] = {
+ "\004\243\103\055\332\374\013\142\352\057\137\142\123"
+ , (PRUint32)1309 }
+ };
+-static const NSSItem nss_builtins_items_171 [] = {
++static const NSSItem nss_builtins_items_151 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11844,7 +10621,7 @@ static const NSSItem nss_builtins_items_171 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_172 [] = {
++static const NSSItem nss_builtins_items_152 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11950,7 +10727,7 @@ static const NSSItem nss_builtins_items_172 [] = {
+ "\364\010"
+ , (PRUint32)1122 }
+ };
+-static const NSSItem nss_builtins_items_173 [] = {
++static const NSSItem nss_builtins_items_153 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -11980,7 +10757,7 @@ static const NSSItem nss_builtins_items_173 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_174 [] = {
++static const NSSItem nss_builtins_items_154 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12094,7 +10871,7 @@ static const NSSItem nss_builtins_items_174 [] = {
+ "\005\323\312\003\112\124"
+ , (PRUint32)1190 }
+ };
+-static const NSSItem nss_builtins_items_175 [] = {
++static const NSSItem nss_builtins_items_155 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12126,7 +10903,7 @@ static const NSSItem nss_builtins_items_175 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_176 [] = {
++static const NSSItem nss_builtins_items_156 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12233,7 +11010,7 @@ static const NSSItem nss_builtins_items_176 [] = {
+ "\062\234\036\273\235\370\146\250"
+ , (PRUint32)1144 }
+ };
+-static const NSSItem nss_builtins_items_177 [] = {
++static const NSSItem nss_builtins_items_157 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12263,7 +11040,7 @@ static const NSSItem nss_builtins_items_177 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_178 [] = {
++static const NSSItem nss_builtins_items_158 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12369,7 +11146,7 @@ static const NSSItem nss_builtins_items_178 [] = {
+ "\275\023\122\035\250\076\315\000\037\310"
+ , (PRUint32)1130 }
+ };
+-static const NSSItem nss_builtins_items_179 [] = {
++static const NSSItem nss_builtins_items_159 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12399,7 +11176,7 @@ static const NSSItem nss_builtins_items_179 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_180 [] = {
++static const NSSItem nss_builtins_items_160 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12508,7 +11285,7 @@ static const NSSItem nss_builtins_items_180 [] = {
+ "\334"
+ , (PRUint32)1217 }
+ };
+-static const NSSItem nss_builtins_items_181 [] = {
++static const NSSItem nss_builtins_items_161 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12536,7 +11313,7 @@ static const NSSItem nss_builtins_items_181 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_182 [] = {
++static const NSSItem nss_builtins_items_162 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12643,7 +11420,7 @@ static const NSSItem nss_builtins_items_182 [] = {
+ "\166\135\165\220\032\365\046\217\360"
+ , (PRUint32)1225 }
+ };
+-static const NSSItem nss_builtins_items_183 [] = {
++static const NSSItem nss_builtins_items_163 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12670,7 +11447,7 @@ static const NSSItem nss_builtins_items_183 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_184 [] = {
++static const NSSItem nss_builtins_items_164 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12820,7 +11597,7 @@ static const NSSItem nss_builtins_items_184 [] = {
+ "\306\224\107\351\050"
+ , (PRUint32)1749 }
+ };
+-static const NSSItem nss_builtins_items_185 [] = {
++static const NSSItem nss_builtins_items_165 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12852,7 +11629,7 @@ static const NSSItem nss_builtins_items_185 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_186 [] = {
++static const NSSItem nss_builtins_items_166 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12995,7 +11772,7 @@ static const NSSItem nss_builtins_items_186 [] = {
+ "\210"
+ , (PRUint32)1665 }
+ };
+-static const NSSItem nss_builtins_items_187 [] = {
++static const NSSItem nss_builtins_items_167 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13026,7 +11803,7 @@ static const NSSItem nss_builtins_items_187 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_188 [] = {
++static const NSSItem nss_builtins_items_168 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13145,7 +11922,7 @@ static const NSSItem nss_builtins_items_188 [] = {
+ "\066\053\143\254\130\001\153\063\051\120\206\203\361\001\110"
+ , (PRUint32)1359 }
+ };
+-static const NSSItem nss_builtins_items_189 [] = {
++static const NSSItem nss_builtins_items_169 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13174,7 +11951,7 @@ static const NSSItem nss_builtins_items_189 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_190 [] = {
++static const NSSItem nss_builtins_items_170 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13294,7 +12071,7 @@ static const NSSItem nss_builtins_items_190 [] = {
+ "\063\004\324"
+ , (PRUint32)1363 }
+ };
+-static const NSSItem nss_builtins_items_191 [] = {
++static const NSSItem nss_builtins_items_171 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13323,7 +12100,7 @@ static const NSSItem nss_builtins_items_191 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_192 [] = {
++static const NSSItem nss_builtins_items_172 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13424,7 +12201,7 @@ static const NSSItem nss_builtins_items_192 [] = {
+ "\264\003\045\274"
+ , (PRUint32)1076 }
+ };
+-static const NSSItem nss_builtins_items_193 [] = {
++static const NSSItem nss_builtins_items_173 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13453,7 +12230,7 @@ static const NSSItem nss_builtins_items_193 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_194 [] = {
++static const NSSItem nss_builtins_items_174 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13546,7 +12323,7 @@ static const NSSItem nss_builtins_items_194 [] = {
+ "\177\333\275\237"
+ , (PRUint32)1028 }
+ };
+-static const NSSItem nss_builtins_items_195 [] = {
++static const NSSItem nss_builtins_items_175 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13572,7 +12349,7 @@ static const NSSItem nss_builtins_items_195 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_196 [] = {
++static const NSSItem nss_builtins_items_176 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13666,7 +12443,7 @@ static const NSSItem nss_builtins_items_196 [] = {
+ "\037\027\224"
+ , (PRUint32)1043 }
+ };
+-static const NSSItem nss_builtins_items_197 [] = {
++static const NSSItem nss_builtins_items_177 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13692,158 +12469,7 @@ static const NSSItem nss_builtins_items_197 [] = {
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_198 [] = {
+-  { (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 *)"StartCom Ltd.", (PRUint32)14 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\201\260\061\013\060\011\006\003\125\004\006\023\002\111\114"
+-"\061\017\060\015\006\003\125\004\010\023\006\111\163\162\141\145"
+-"\154\061\016\060\014\006\003\125\004\007\023\005\105\151\154\141"
+-"\164\061\026\060\024\006\003\125\004\012\023\015\123\164\141\162"
+-"\164\103\157\155\040\114\164\144\056\061\032\060\030\006\003\125"
+-"\004\013\023\021\103\101\040\101\165\164\150\157\162\151\164\171"
+-"\040\104\145\160\056\061\051\060\047\006\003\125\004\003\023\040"
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..3e2a6be

Lines of this file are not shown. View the raw message.

63 lines not on this page · raw message

156 lines not on this page · raw message

new file mode 100644
index 0000000..e638339

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..20b5c59

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..4bf518d

Lines of this file are not shown. View the raw message.

355 lines not on this page · raw message

83 lines not on this page · raw message

new file mode 100644
index 0000000..3b19f65

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..8e44005

Lines of this file are not shown. View the raw message.

1,172 lines not on this page · raw message

new file mode 100644
index 0000000..2508d82

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..27d45c3

Lines of this file are not shown. View the raw message.

67 lines not on this page · raw message

new file mode 100644
index 0000000..84e4ef7

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..2b15c0a

Lines of this file are not shown. View the raw message.

116 lines not on this page · raw message