Sat Sep 17 23:14:43 UTC 2011

4 files changed, 2303 insertions, 36 deletions

diff --git a/multilib/lib32-nspr/PKGBUILD b/multilib/lib32-nspr/PKGBUILD
index f3bf0198f..dbb4d43eb 100644
--- a/multilib/lib32-nspr/PKGBUILD
+++ b/multilib/lib32-nspr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 26713 2010-09-15 22:57:32Z bluewind $
+# $Id: PKGBUILD 55627 2011-09-16 13:38:37Z bluewind $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 _pkgbasename=nspr
 pkgname=lib32-$_pkgbasename
-pkgver=4.8.6
-pkgrel=2
+pkgver=4.8.9
+pkgrel=1
 pkgdesc="Netscape Portable Runtime (32-bit)"
 arch=('x86_64')
 url="http://www.mozilla.org/projects/nspr/"
@@ -14,13 +14,15 @@ makedepends=('zip' 'gcc-multilib')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_pkgbasename}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('592c275728c29d193fdba8009165990b'
+md5sums=('60770d45dc08c0f181b22cdfce5be3e8'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  unset CFLAGS
-  unset CXXFLAGS
+
+  sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+    -i mozilla/nsprpub/config/rules.mk
+
   ./mozilla/nsprpub/configure \
       --prefix=/usr \
       --libdir=/usr/lib32 \
diff --git a/multilib/lib32-nss/PKGBUILD b/multilib/lib32-nss/PKGBUILD
index 1663f1c25..b747e1a31 100644
--- a/multilib/lib32-nss/PKGBUILD
+++ b/multilib/lib32-nss/PKGBUILD
@@ -1,42 +1,47 @@
-# $Id: PKGBUILD 35060 2010-12-15 09:33:55Z heftig $
+# $Id: PKGBUILD 55628 2011-09-16 13:40:10Z bluewind $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 _pkgbasename=nss
 pkgname=lib32-$_pkgbasename
-pkgver=3.12.8
+pkgver=3.12.11
 pkgrel=1
-pkgdesc="Mozilla's Netscape Security Services Library that implements PKI support (32-bit)"
+pkgdesc="Mozilla Network Security Services (32-bit)"
 arch=('x86_64')
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.8.6
+_nsprver=4.8.9
 depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite3>=3.6.17' "$_pkgbasename" 'lib32-zlib')
 makedepends=('gcc-multilib' 'perl')
+options=('!strip')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
         nss-no-rpath.patch
         nss.pc.in
+        distrust-diginotar.patch
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
-options=('!strip')
-md5sums=('40bf1bb0c7567827d3768d1fc6081100'
+md5sums=('ca0ca058380be200cf247ea2496b5352'
          'e5c97db0c884d5f4cfda21e562dc9bba'
          'c547b030c57fe1ed8b77c73bf52b3ded'
-         '7f39c19b1dfd62d7db7d8bf19f156fed'
+         'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf'
+         'ba2357c5b9881bfd7d54b037954ba0ff'
          'd83c7b61abb7e9f8f7bcd157183d1ade')
 
 build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  cd "${srcdir}/${_pkgbasename}-${pkgver}/mozilla"
+  # Distrust DigiNotar root CA - backported from CVS (https://bugzilla.mozilla.org/show_bug.cgi?id=682927)
+  patch -Np0 -i "${srcdir}/distrust-diginotar.patch"
   # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian
-  patch -Np1 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
+  patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
   # Adds transitional SSL renegotiate support - patch from Debian
-  patch -Np1 -i "${srcdir}/ssl-renegotiate-transitional.patch"
+  patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
   # Removes rpath
-  patch -Np0 -i "${srcdir}/nss-no-rpath.patch"
+  patch -Np2 -i "${srcdir}/nss-no-rpath.patch"
+
+  # Respect LDFLAGS
+  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
+      -i security/coreconf/rules.mk
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
 
-  make -C mozilla/security/nss/lib/ckfw/builtins generate
-  
-  unset CFLAGS
-  unset CXXFLAGS
   export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
   export BUILD_OPT=1
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
@@ -44,28 +49,24 @@ build() {
   export NSS_USE_SYSTEM_SQLITE=1
   export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
   export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
+  export XCFLAGS="${CFLAGS}"
 
   make -j 1 -C mozilla/security/coreconf
   make -j 1 -C mozilla/security/dbm
   make -j 1 -C mozilla/security/nss
+}
 
-  NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
+package() {
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
 
   sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib32,g" \
   				-e "s,%prefix%,/usr,g" \
 				-e "s,%exec_prefix%,/usr/bin,g" \
 				-e "s,%includedir%,/usr/include/nss,g" \
-				-e "s,%NSPR_VERSION%,${_nsprver},g" \
+				-e "s,%NSPR_VERSION%,${pkgver},g" \
 				-e "s,%NSS_VERSION%,${pkgver},g" > \
-			"${srcdir}/nss.pc"
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-  install -m644 "${srcdir}"/nss.pc "${pkgdir}/usr/lib32/pkgconfig/nss.pc"
+			"${pkgdir}/usr/lib32/pkgconfig/nss.pc"
   ln -sf nss.pc "${pkgdir}/usr/lib32/pkgconfig/mozilla-nss.pc"
   chmod 644 ${pkgdir}/usr/lib32/pkgconfig/*.pc
 
diff --git a/multilib/lib32-nss/add_spi+cacert_ca_certs.patch b/multilib/lib32-nss/add_spi+cacert_ca_certs.patch
index 1cc7c18f5..0af0deab7 100644
--- a/multilib/lib32-nss/add_spi+cacert_ca_certs.patch
+++ b/multilib/lib32-nss/add_spi+cacert_ca_certs.patch
@@ -1,8 +1,597 @@
---- a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-+++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-@@ -20926,3 +20926,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds the SPI Inc. and CAcert.org CA certificates
+
+Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.c
+===================================================================
+--- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.c	2011-08-12 12:29:13.000000000 +0200
++++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.c	2011-08-12 12:29:29.056420467 +0200
+@@ -1045,6 +1045,24 @@
+ static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = {
+  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_328 [] = {
++ 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_329 [] = {
++ 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_330 [] = {
++ 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_331 [] = {
++ 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_332 [] = {
++ 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_333 [] = {
++ 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) },
+@@ -21910,6 +21928,531 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
++static const NSSItem nss_builtins_items_328 [] = {
++  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 },
++  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"0", (PRUint32)2 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\000"
++, (PRUint32)3 },
++  { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000"
++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
++"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
++"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
++"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
++"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
++"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
++"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
++"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
++"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063"
++"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060"
++"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016"
++"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
++"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
++"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
++"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
++"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
++"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
++"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
++"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
++"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
++"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007"
++"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002"
++"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011"
++"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315"
++"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230"
++"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272"
++"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016"
++"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052"
++"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262"
++"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140"
++"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150"
++"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273"
++"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022"
++"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234"
++"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334"
++"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070"
++"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232"
++"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044"
++"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355"
++"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252"
++"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352"
++"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276"
++"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306"
++"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320"
++"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167"
++"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335"
++"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324"
++"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246"
++"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106"
++"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272"
++"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334"
++"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304"
++"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060"
++"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265"
++"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071"
++"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230"
++"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260"
++"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016"
++"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
++"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
++"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
++"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
++"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
++"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
++"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
++"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001"
++"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037"
++"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160"
++"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157"
++"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006"
++"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164"
++"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060"
++"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045"
++"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162"
++"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077"
++"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102"
++"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165"
++"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164"
++"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040"
++"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167"
++"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006"
++"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001"
++"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201"
++"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275"
++"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234"
++"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323"
++"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073"
++"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140"
++"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353"
++"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160"
++"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334"
++"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231"
++"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116"
++"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145"
++"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031"
++"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363"
++"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330"
++"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367"
++"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260"
++"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223"
++"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335"
++"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026"
++"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005"
++"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361"
++"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371"
++"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246"
++"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206"
++"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153"
++"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344"
++"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143"
++"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362"
++"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226"
++"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175"
++"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305"
++"\103"
++, (PRUint32)1857 }
++};
++static const NSSItem nss_builtins_items_329 [] = {
++  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 },
++  { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106"
++"\166\316\217\063"
++, (PRUint32)20 },
++  { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153"
++, (PRUint32)16 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\000"
++, (PRUint32)3 },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
++};
++static const NSSItem nss_builtins_items_330 [] = {
++  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 },
++  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
++  { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143"
++"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004"
++"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101"
++"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004"
++"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040"
++"\063\040\122\157\157\164"
++, (PRUint32)86 },
++  { (void *)"0", (PRUint32)2 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\001"
++, (PRUint32)3 },
++  { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001"
++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
++"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
++"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
++"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
++"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
++"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
++"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
++"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
++"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065"
++"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060"
++"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022"
++"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156"
++"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164"
++"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157"
++"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143"
++"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164"
++"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
++"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
++"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335"
++"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175"
++"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163"
++"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144"
++"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001"
++"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171"
++"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313"
++"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011"
++"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353"
++"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277"
++"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331"
++"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205"
++"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073"
++"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161"
++"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371"
++"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047"
++"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252"
++"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102"
++"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064"
++"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133"
++"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242"
++"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137"
++"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325"
++"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150"
++"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230"
++"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140"
++"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347"
++"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321"
++"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206"
++"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257"
++"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164"
++"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373"
++"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003"
++"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006"
++"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006"
++"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072"
++"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162"
++"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034"
++"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162"
++"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003"
++"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001"
++"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002"
++"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101"
++"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160"
++"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206"
++"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241"
++"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072"
++"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135"
++"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253"
++"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364"
++"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172"
++"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302"
++"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214"
++"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074"
++"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154"
++"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025"
++"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352"
++"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231"
++"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213"
++"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325"
++"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242"
++"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214"
++"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027"
++"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057"
++"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224"
++"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134"
++"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356"
++"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005"
++"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355"
++"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143"
++"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123"
++"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243"
++"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005"
++"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156"
++"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317"
++"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360"
++"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101"
++"\322\156\245\033\231\047\200\347\013\251\250\000"
++, (PRUint32)1548 }
++};
++static const NSSItem nss_builtins_items_331 [] = {
++  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
++  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
++  { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 },
++  { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304"
++"\030\116\052\055"
++, (PRUint32)20 },
++  { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266"
++, (PRUint32)16 },
++  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
++"\100\143\141\143\145\162\164\056\157\162\147"
++, (PRUint32)123 },
++  { (void *)"\002\001\001"
++, (PRUint32)3 },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
++};
++static const NSSItem nss_builtins_items_332 [] = {
++  { (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 *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 },
++  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
++  { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
++, (PRUint32)191 },
++  { (void *)"0", (PRUint32)2 },
++  { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
++, (PRUint32)191 },
++  { (void *)"\002\011\000\350\216\266\311\370\052\024\050"
++, (PRUint32)11 },
++  { (void *)"\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000"
++"\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206"
++"\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003"
++"\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010"
++"\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125"
++"\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163"
++"\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167"
++"\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151"
++"\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003"
++"\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061"
++"\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146"
++"\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061"
++"\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026"
++"\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151"
++"\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063"
++"\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060"
++"\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125"
++"\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023"
++"\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004"
++"\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061"
++"\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141"
++"\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143"
++"\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125"
++"\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036"
++"\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151"
++"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045"
++"\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150"
++"\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156"
++"\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
++"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
++"\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051"
++"\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074"
++"\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271"
++"\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240"
++"\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321"
++"\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265"
++"\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175"
++"\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375"
++"\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161"
++"\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342"
++"\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172"
++"\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056"
++"\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247"
++"\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310"
++"\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361"
++"\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356"
++"\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110"
++"\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151"
++"\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316"
++"\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307"
++"\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320"
++"\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205"
++"\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123"
++"\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154"
++"\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275"
++"\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356"
++"\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250"
++"\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204"
++"\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147"
++"\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305"
++"\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057"
++"\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124"
++"\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060"
++"\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161"
++"\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122"
++"\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346"
++"\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102"
++"\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061"
++"\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016"
++"\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025"
++"\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141"
++"\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037"
++"\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040"
++"\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061"
++"\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141"
++"\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103"
++"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157"
++"\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015"
++"\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100"
++"\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216"
++"\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377"
++"\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206"
++"\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035"
++"\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102"
++"\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151"
++"\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164"
++"\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102"
++"\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141"
++"\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055"
++"\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206"
++"\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057"
++"\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143"
++"\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125"
++"\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164"
++"\145\162\100\163\160\151\055\151\156\143\056\157\162\147\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\002"
++"\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162"
++"\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030"
++"\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255"
++"\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065"
++"\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014"
++"\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306"
++"\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051"
++"\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017"
++"\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302"
++"\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213"
++"\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017"
++"\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162"
++"\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152"
++"\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357"
++"\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266"
++"\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104"
++"\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177"
++"\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253"
++"\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206"
++"\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217"
++"\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265"
++"\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225"
++"\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140"
++"\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207"
++"\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252"
++"\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340"
++"\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254"
++"\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275"
++"\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132"
++"\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151"
++"\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005"
++"\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004"
++"\243\140"
++, (PRUint32)2066 }
++};
++static const NSSItem nss_builtins_items_333 [] = {
++  { (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 *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 },
++  { (void *)"\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044"
++"\251\220\103\034"
++, (PRUint32)20 },
++  { (void *)"\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170"
++, (PRUint32)16 },
++  { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
++, (PRUint32)191 },
++  { (void *)"\002\011\000\350\216\266\311\370\052\024\050"
++, (PRUint32)11 },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
++  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
++};
+ 
+ builtinsInternalObject
+ nss_builtins_data[] = {
+@@ -22244,11 +22787,17 @@
+   { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
+   { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} },
+   { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} },
+-  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }
++  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} },
++  { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} },
++  { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} },
++  { 11, nss_builtins_types_330, nss_builtins_items_330, {NULL} },
++  { 13, nss_builtins_types_331, nss_builtins_items_331, {NULL} },
++  { 11, nss_builtins_types_332, nss_builtins_items_332, {NULL} },
++  { 13, nss_builtins_types_333, nss_builtins_items_333, {NULL} }
+ };
+ const PRUint32
+ #ifdef DEBUG
+-  nss_builtins_nObjects = 327+1;
++  nss_builtins_nObjects = 333+1;
+ #else
+-  nss_builtins_nObjects = 327;
++  nss_builtins_nObjects = 333;
+ #endif /* DEBUG */
+Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+===================================================================
+--- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2011-08-12 12:25:29.000000000 +0200
++++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2011-08-12 12:29:25.460425941 +0200
+@@ -22589,3 +22589,558 @@
  CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
  CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 +
 +#
diff --git a/multilib/lib32-nss/distrust-diginotar.patch b/multilib/lib32-nss/distrust-diginotar.patch
new file mode 100644
index 000000000..60c63fc68
--- /dev/null
+++ b/multilib/lib32-nss/distrust-diginotar.patch
@@ -0,0 +1,1675 @@
+Index: security/nss/lib/ckfw/builtins/certdata.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.c,v
+retrieving revision 1.67.2.10
+retrieving revision 1.67.2.11
+diff -u -r1.67.2.10 -r1.67.2.11
+--- security/nss/lib/ckfw/builtins/certdata.c	1 Aug 2011 06:40:03 -0000	1.67.2.10
++++ security/nss/lib/ckfw/builtins/certdata.c	30 Aug 2011 20:04:39 -0000	1.67.2.11
+@@ -35,7 +35,7 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ #ifdef DEBUG
+-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $";
++static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $";
+ #endif /* DEBUG */
+ 
+ #ifndef BUILTINS_H
+@@ -1039,12 +1039,6 @@
+ static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = {
+  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_328 [] = {
+- 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_329 [] = {
+- 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) },
+@@ -1053,7 +1047,7 @@
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)"CVS ID", (PRUint32)7 },
+   { (void *)"NSS", (PRUint32)4 },
+-  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $", (PRUint32)164 }
++  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $", (PRUint32)165 }
+ };
+ #endif /* DEBUG */
+ static const NSSItem nss_builtins_items_1 [] = {
+@@ -12506,151 +12500,6 @@
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+-  { (void *)"DigiNotar Root CA", (PRUint32)18 },
+-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+-  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
+-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
+-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
+-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
+-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
+-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
+-"\154"
+-, (PRUint32)97 },
+-  { (void *)"0", (PRUint32)2 },
+-  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
+-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
+-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
+-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
+-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
+-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
+-"\154"
+-, (PRUint32)97 },
+-  { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
+-"\074\114"
+-, (PRUint32)18 },
+-  { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014"
+-"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060"
+-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137"
+-"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060"
+-"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141"
+-"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151"
+-"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060"
+-"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156"
+-"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060"
+-"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132"
+-"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060"
+-"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022"
+-"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164"
+-"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147"
+-"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040"
+-"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151"
+-"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154"
+-"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
+-"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
+-"\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126"
+-"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201"
+-"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300"
+-"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177"
+-"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330"
+-"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213"
+-"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337"
+-"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045"
+-"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123"
+-"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007"
+-"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043"
+-"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042"
+-"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041"
+-"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324"
+-"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313"
+-"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110"
+-"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114"
+-"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376"
+-"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344"
+-"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357"
+-"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346"
+-"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314"
+-"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351"
+-"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154"
+-"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262"
+-"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042"
+-"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077"
+-"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102"
+-"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323"
+-"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176"
+-"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147"
+-"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216"
+-"\243\002\003\001\000\001\243\102\060\100\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\035\006\003\125"
+-"\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153"
+-"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206"
+-"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002"
+-"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004"
+-"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257"
+-"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362"
+-"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203"
+-"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302"
+-"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150"
+-"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307"
+-"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050"
+-"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350"
+-"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013"
+-"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075"
+-"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114"
+-"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313"
+-"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273"
+-"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235"
+-"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146"
+-"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160"
+-"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007"
+-"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351"
+-"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134"
+-"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045"
+-"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113"
+-"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174"
+-"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304"
+-"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012"
+-"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330"
+-"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124"
+-"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163"
+-"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056"
+-"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175"
+-"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163"
+-"\262\345\214\360\206\231\270\345\305\337\204\301\267\353"
+-, (PRUint32)1422 }
+-};
+-static const NSSItem nss_builtins_items_187 [] = {
+-  { (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 *)"DigiNotar Root CA", (PRUint32)18 },
+-  { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317"
+-"\201\147\107\214"
+-, (PRUint32)20 },
+-  { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230"
+-, (PRUint32)16 },
+-  { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
+-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
+-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
+-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
+-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
+-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
+-"\154"
+-, (PRUint32)97 },
+-  { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
+-"\074\114"
+-, (PRUint32)18 },
+-  { (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_false, (PRUint32)sizeof(CK_BBOOL) }
+-};
+-static const NSSItem nss_builtins_items_188 [] = {
+-  { (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 *)"Network Solutions Certificate Authority", (PRUint32)40 },
+   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+   { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+@@ -12738,7 +12587,7 @@
+ "\244\140\114\260\125\240\240\173\127\262"
+ , (PRUint32)1002 }
+ };
+-static const NSSItem nss_builtins_items_189 [] = {
++static const NSSItem nss_builtins_items_187 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12765,7 +12614,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_190 [] = {
++static const NSSItem nss_builtins_items_188 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12874,7 +12723,7 @@
+ "\333"
+ , (PRUint32)1217 }
+ };
+-static const NSSItem nss_builtins_items_191 [] = {
++static const NSSItem nss_builtins_items_189 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12902,7 +12751,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_192 [] = {
++static const NSSItem nss_builtins_items_190 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -12976,7 +12825,7 @@
+ "\334\335\363\377\035\054\072\026\127\331\222\071\326"
+ , (PRUint32)653 }
+ };
+-static const NSSItem nss_builtins_items_193 [] = {
++static const NSSItem nss_builtins_items_191 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13005,7 +12854,7 @@
+   { (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_192 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13097,7 +12946,7 @@
+ "\321\236\164\310\166\147"
+ , (PRUint32)1078 }
+ };
+-static const NSSItem nss_builtins_items_195 [] = {
++static const NSSItem nss_builtins_items_193 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13122,7 +12971,7 @@
+   { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_196 [] = {
++static const NSSItem nss_builtins_items_194 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13219,7 +13068,7 @@
+ "\253\205\322\140\126\132"
+ , (PRUint32)1030 }
+ };
+-static const NSSItem nss_builtins_items_197 [] = {
++static const NSSItem nss_builtins_items_195 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13247,7 +13096,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_198 [] = {
++static const NSSItem nss_builtins_items_196 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13332,7 +13181,7 @@
+ "\164"
+ , (PRUint32)897 }
+ };
+-static const NSSItem nss_builtins_items_199 [] = {
++static const NSSItem nss_builtins_items_197 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13358,7 +13207,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_200 [] = {
++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) },
+@@ -13455,7 +13304,7 @@
+ "\374\276\337\012\015"
+ , (PRUint32)1013 }
+ };
+-static const NSSItem nss_builtins_items_201 [] = {
++static const NSSItem nss_builtins_items_199 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13484,7 +13333,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_202 [] = {
++static const NSSItem nss_builtins_items_200 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13595,7 +13444,7 @@
+ "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224"
+ , (PRUint32)1151 }
+ };
+-static const NSSItem nss_builtins_items_203 [] = {
++static const NSSItem nss_builtins_items_201 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13627,7 +13476,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_204 [] = {
++static const NSSItem nss_builtins_items_202 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13781,7 +13630,7 @@
+ "\103\307\003\340\067\116\135\012\334\131\040\045"
+ , (PRUint32)1964 }
+ };
+-static const NSSItem nss_builtins_items_205 [] = {
++static const NSSItem nss_builtins_items_203 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13809,7 +13658,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_206 [] = {
++static const NSSItem nss_builtins_items_204 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13890,7 +13739,7 @@
+ "\300\226\130\057\352\273\106\327\273\344\331\056"
+ , (PRUint32)940 }
+ };
+-static const NSSItem nss_builtins_items_207 [] = {
++static const NSSItem nss_builtins_items_205 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -13913,7 +13762,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_208 [] = {
++static const NSSItem nss_builtins_items_206 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14047,7 +13896,7 @@
+ "\005\211\374\170\326\134\054\046\103\251"
+ , (PRUint32)1642 }
+ };
+-static const NSSItem nss_builtins_items_209 [] = {
++static const NSSItem nss_builtins_items_207 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14075,7 +13924,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_210 [] = {
++static const NSSItem nss_builtins_items_208 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14180,7 +14029,7 @@
+ "\334\144\047\027\214\132\267\332\164\050\315\227\344\275"
+ , (PRUint32)1198 }
+ };
+-static const NSSItem nss_builtins_items_211 [] = {
++static const NSSItem nss_builtins_items_209 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14207,7 +14056,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_212 [] = {
++static const NSSItem nss_builtins_items_210 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14312,7 +14161,7 @@
+ "\016\121\075\157\373\226\126\200\342\066\027\321\334\344"
+ , (PRUint32)1198 }
+ };
+-static const NSSItem nss_builtins_items_213 [] = {
++static const NSSItem nss_builtins_items_211 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14339,7 +14188,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_214 [] = {
++static const NSSItem nss_builtins_items_212 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14432,7 +14281,7 @@
+ "\230"
+ , (PRUint32)993 }
+ };
+-static const NSSItem nss_builtins_items_215 [] = {
++static const NSSItem nss_builtins_items_213 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14459,7 +14308,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_216 [] = {
++static const NSSItem nss_builtins_items_214 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14548,7 +14397,7 @@
+ "\126\144\127"
+ , (PRUint32)931 }
+ };
+-static const NSSItem nss_builtins_items_217 [] = {
++static const NSSItem nss_builtins_items_215 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14575,7 +14424,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_218 [] = {
++static const NSSItem nss_builtins_items_216 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14656,7 +14505,7 @@
+ "\000\147\240\161\000\202\110"
+ , (PRUint32)919 }
+ };
+-static const NSSItem nss_builtins_items_219 [] = {
++static const NSSItem nss_builtins_items_217 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14680,7 +14529,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_220 [] = {
++static const NSSItem nss_builtins_items_218 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14762,7 +14611,7 @@
+ "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217"
+ , (PRUint32)943 }
+ };
+-static const NSSItem nss_builtins_items_221 [] = {
++static const NSSItem nss_builtins_items_219 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14786,7 +14635,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_222 [] = {
++static const NSSItem nss_builtins_items_220 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14867,7 +14716,7 @@
+ "\246\210\070\316\125"
+ , (PRUint32)933 }
+ };
+-static const NSSItem nss_builtins_items_223 [] = {
++static const NSSItem nss_builtins_items_221 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -14890,7 +14739,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_224 [] = {
++static const NSSItem nss_builtins_items_222 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15009,7 +14858,7 @@
+ "\201\370\021\234"
+ , (PRUint32)1460 }
+ };
+-static const NSSItem nss_builtins_items_225 [] = {
++static const NSSItem nss_builtins_items_223 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15035,7 +14884,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_226 [] = {
++static const NSSItem nss_builtins_items_224 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15169,7 +15018,7 @@
+ "\311\234\220\332\354\251\102\074\255\266\002"
+ , (PRUint32)1307 }
+ };
+-static const NSSItem nss_builtins_items_227 [] = {
++static const NSSItem nss_builtins_items_225 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15207,7 +15056,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_228 [] = {
++static const NSSItem nss_builtins_items_226 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15285,7 +15134,7 @@
+ "\366\324\357\277\114\210\150"
+ , (PRUint32)855 }
+ };
+-static const NSSItem nss_builtins_items_229 [] = {
++static const NSSItem nss_builtins_items_227 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15309,7 +15158,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_230 [] = {
++static const NSSItem nss_builtins_items_228 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15387,7 +15236,7 @@
+ "\246\347\313\100\003\335\171"
+ , (PRUint32)855 }
+ };
+-static const NSSItem nss_builtins_items_231 [] = {
++static const NSSItem nss_builtins_items_229 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15411,7 +15260,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_232 [] = {
++static const NSSItem nss_builtins_items_230 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15538,7 +15387,7 @@
+ "\320\352\111\242\034\215\122\024\246\012\223"
+ , (PRUint32)1515 }
+ };
+-static const NSSItem nss_builtins_items_233 [] = {
++static const NSSItem nss_builtins_items_231 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15566,7 +15415,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_234 [] = {
++static const NSSItem nss_builtins_items_232 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15640,7 +15489,7 @@
+ "\366\356\260\132\116\111\104\124\130\137\102\203"
+ , (PRUint32)828 }
+ };
+-static const NSSItem nss_builtins_items_235 [] = {
++static const NSSItem nss_builtins_items_233 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15663,7 +15512,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_236 [] = {
++static const NSSItem nss_builtins_items_234 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15739,7 +15588,7 @@
+ "\011\333\212\101\202\236\146\233\021"
+ , (PRUint32)857 }
+ };
+-static const NSSItem nss_builtins_items_237 [] = {
++static const NSSItem nss_builtins_items_235 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15762,7 +15611,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_238 [] = {
++static const NSSItem nss_builtins_items_236 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15845,7 +15694,7 @@
+ "\262\033\211\124"
+ , (PRUint32)932 }
+ };
+-static const NSSItem nss_builtins_items_239 [] = {
++static const NSSItem nss_builtins_items_237 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15869,7 +15718,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_240 [] = {
++static const NSSItem nss_builtins_items_238 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15969,7 +15818,7 @@
+ "\021\055"
+ , (PRUint32)1026 }
+ };
+-static const NSSItem nss_builtins_items_241 [] = {
++static const NSSItem nss_builtins_items_239 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -15999,7 +15848,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_242 [] = {
++static const NSSItem nss_builtins_items_240 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16073,7 +15922,7 @@
+ "\367\130\077\056\162\002\127\243\217\241\024\056"
+ , (PRUint32)652 }
+ };
+-static const NSSItem nss_builtins_items_243 [] = {
++static const NSSItem nss_builtins_items_241 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16102,7 +15951,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_244 [] = {
++static const NSSItem nss_builtins_items_242 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16208,7 +16057,7 @@
+ "\061\324\100\032\142\064\066\077\065\001\256\254\143\240"
+ , (PRUint32)1070 }
+ };
+-static const NSSItem nss_builtins_items_245 [] = {
++static const NSSItem nss_builtins_items_243 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16240,7 +16089,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_246 [] = {
++static const NSSItem nss_builtins_items_244 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16319,7 +16168,7 @@
+ "\017\212"
+ , (PRUint32)690 }
+ };
+-static const NSSItem nss_builtins_items_247 [] = {
++static const NSSItem nss_builtins_items_245 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16349,7 +16198,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_248 [] = {
++static const NSSItem nss_builtins_items_246 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16464,7 +16313,7 @@
+ "\354\315\202\141\361\070\346\117\227\230\052\132\215"
+ , (PRUint32)1213 }
+ };
+-static const NSSItem nss_builtins_items_249 [] = {
++static const NSSItem nss_builtins_items_247 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16496,7 +16345,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_250 [] = {
++static const NSSItem nss_builtins_items_248 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16594,7 +16443,7 @@
+ "\055\247\330\206\052\335\056\020"
+ , (PRUint32)904 }
+ };
+-static const NSSItem nss_builtins_items_251 [] = {
++static const NSSItem nss_builtins_items_249 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16627,7 +16476,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_252 [] = {
++static const NSSItem nss_builtins_items_250 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16729,7 +16578,7 @@
+ "\330\316\304\143\165\077\131\107\261"
+ , (PRUint32)1049 }
+ };
+-static const NSSItem nss_builtins_items_253 [] = {
++static const NSSItem nss_builtins_items_251 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16759,7 +16608,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_254 [] = {
++static const NSSItem nss_builtins_items_252 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16878,7 +16727,7 @@
+ "\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
+ , (PRUint32)1486 }
+ };
+-static const NSSItem nss_builtins_items_255 [] = {
++static const NSSItem nss_builtins_items_253 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16903,7 +16752,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_256 [] = {
++static const NSSItem nss_builtins_items_254 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -16993,7 +16842,7 @@
+ "\315\345\250"
+ , (PRUint32)1043 }
+ };
+-static const NSSItem nss_builtins_items_257 [] = {
++static const NSSItem nss_builtins_items_255 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17017,7 +16866,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_258 [] = {
++static const NSSItem nss_builtins_items_256 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17122,7 +16971,7 @@
+ "\115\273\306\104\333\066\313\052\234\216"
+ , (PRUint32)1258 }
+ };
+-static const NSSItem nss_builtins_items_259 [] = {
++static const NSSItem nss_builtins_items_257 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17147,7 +16996,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_260 [] = {
++static const NSSItem nss_builtins_items_258 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17223,7 +17072,7 @@
+ "\002\153\331\132"
+ , (PRUint32)820 }
+ };
+-static const NSSItem nss_builtins_items_261 [] = {
++static const NSSItem nss_builtins_items_259 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17247,7 +17096,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_262 [] = {
++static const NSSItem nss_builtins_items_260 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17329,7 +17178,7 @@
+ "\362"
+ , (PRUint32)881 }
+ };
+-static const NSSItem nss_builtins_items_263 [] = {
++static const NSSItem nss_builtins_items_261 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17354,7 +17203,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_264 [] = {
++static const NSSItem nss_builtins_items_262 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17470,7 +17319,7 @@
+ "\113\076\053\070\007\125\230\136\244"
+ , (PRUint32)1465 }
+ };
+-static const NSSItem nss_builtins_items_265 [] = {
++static const NSSItem nss_builtins_items_263 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17494,7 +17343,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_266 [] = {
++static const NSSItem nss_builtins_items_264 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17559,7 +17408,7 @@
+ "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133"
+ , (PRUint32)576 }
+ };
+-static const NSSItem nss_builtins_items_267 [] = {
++static const NSSItem nss_builtins_items_265 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17586,7 +17435,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_268 [] = {
++static const NSSItem nss_builtins_items_266 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17651,7 +17500,7 @@
+ "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220"
+ , (PRUint32)576 }
+ };
+-static const NSSItem nss_builtins_items_269 [] = {
++static const NSSItem nss_builtins_items_267 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17678,7 +17527,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_270 [] = {
++static const NSSItem nss_builtins_items_268 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17775,7 +17624,7 @@
+ "\202\042\055\172\124\253\160\303\175\042\145\202\160\226"
+ , (PRUint32)1038 }
+ };
+-static const NSSItem nss_builtins_items_271 [] = {
++static const NSSItem nss_builtins_items_269 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17803,7 +17652,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_272 [] = {
++static const NSSItem nss_builtins_items_270 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17894,7 +17743,7 @@
+ "\336\102\343\055\202\361\017\345\372\227"
+ , (PRUint32)954 }
+ };
+-static const NSSItem nss_builtins_items_273 [] = {
++static const NSSItem nss_builtins_items_271 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -17922,7 +17771,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_274 [] = {
++static const NSSItem nss_builtins_items_272 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18001,7 +17850,7 @@
+ "\130\077\137"
+ , (PRUint32)867 }
+ };
+-static const NSSItem nss_builtins_items_275 [] = {
++static const NSSItem nss_builtins_items_273 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18025,7 +17874,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_276 [] = {
++static const NSSItem nss_builtins_items_274 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18118,7 +17967,7 @@
+ "\045\361\224\264\146"
+ , (PRUint32)997 }
+ };
+-static const NSSItem nss_builtins_items_277 [] = {
++static const NSSItem nss_builtins_items_275 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18145,7 +17994,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_278 [] = {
++static const NSSItem nss_builtins_items_276 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18269,7 +18118,7 @@
+ "\156\117\022\176\012\074\235\225"
+ , (PRUint32)1560 }
+ };
+-static const NSSItem nss_builtins_items_279 [] = {
++static const NSSItem nss_builtins_items_277 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18294,7 +18143,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_280 [] = {
++static const NSSItem nss_builtins_items_278 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18413,7 +18262,7 @@
+ "\333\374\046\210\307"
+ , (PRUint32)1525 }
+ };
+-static const NSSItem nss_builtins_items_281 [] = {
++static const NSSItem nss_builtins_items_279 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18437,7 +18286,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_282 [] = {
++static const NSSItem nss_builtins_items_280 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18593,7 +18442,7 @@
+ "\167\110\320"
+ , (PRUint32)1875 }
+ };
+-static const NSSItem nss_builtins_items_283 [] = {
++static const NSSItem nss_builtins_items_281 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18624,7 +18473,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_284 [] = {
++static const NSSItem nss_builtins_items_282 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18777,7 +18626,7 @@
+ "\351\233\256\325\124\300\164\200\321\013\102\237\301"
+ , (PRUint32)1869 }
+ };
+-static const NSSItem nss_builtins_items_285 [] = {
++static const NSSItem nss_builtins_items_283 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18807,7 +18656,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_286 [] = {
++static const NSSItem nss_builtins_items_284 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18943,7 +18792,7 @@
+ "\242\355\264\324\265\145\103\267\223\106\212\323"
+ , (PRUint32)1532 }
+ };
+-static const NSSItem nss_builtins_items_287 [] = {
++static const NSSItem nss_builtins_items_285 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -18973,7 +18822,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_288 [] = {
++static const NSSItem nss_builtins_items_286 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19124,7 +18973,7 @@
+ "\264"
+ , (PRUint32)1761 }
+ };
+-static const NSSItem nss_builtins_items_289 [] = {
++static const NSSItem nss_builtins_items_287 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19154,7 +19003,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_290 [] = {
++static const NSSItem nss_builtins_items_288 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19290,7 +19139,7 @@
+ "\111\043"
+ , (PRUint32)1522 }
+ };
+-static const NSSItem nss_builtins_items_291 [] = {
++static const NSSItem nss_builtins_items_289 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19320,7 +19169,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_292 [] = {
++static const NSSItem nss_builtins_items_290 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19455,7 +19304,7 @@
+ "\172\244\047\023\326\117\364\151"
+ , (PRUint32)1512 }
+ };
+-static const NSSItem nss_builtins_items_293 [] = {
++static const NSSItem nss_builtins_items_291 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19485,7 +19334,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_294 [] = {
++static const NSSItem nss_builtins_items_292 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19621,7 +19470,7 @@
+ "\302\021\254"
+ , (PRUint32)1523 }
+ };
+-static const NSSItem nss_builtins_items_295 [] = {
++static const NSSItem nss_builtins_items_293 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19651,7 +19500,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_296 [] = {
++static const NSSItem nss_builtins_items_294 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19787,7 +19636,7 @@
+ "\147\024\060"
+ , (PRUint32)1523 }
+ };
+-static const NSSItem nss_builtins_items_297 [] = {
++static const NSSItem nss_builtins_items_295 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19817,7 +19666,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_298 [] = {
++static const NSSItem nss_builtins_items_296 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19951,7 +19800,7 @@
+ "\217\116\235\306\066\347\134\246\253\022\017\326\317"
+ , (PRUint32)1501 }
+ };
+-static const NSSItem nss_builtins_items_299 [] = {
++static const NSSItem nss_builtins_items_297 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -19981,7 +19830,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_300 [] = {
++static const NSSItem nss_builtins_items_298 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20115,7 +19964,7 @@
+ "\130\113\161\203\237\146\346\254\171\110\376\376\107"
+ , (PRUint32)1501 }
+ };
+-static const NSSItem nss_builtins_items_301 [] = {
++static const NSSItem nss_builtins_items_299 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20145,7 +19994,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_302 [] = {
++static const NSSItem nss_builtins_items_300 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20280,7 +20129,7 @@
+ "\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352"
+ , (PRUint32)1520 }
+ };
+-static const NSSItem nss_builtins_items_303 [] = {
++static const NSSItem nss_builtins_items_301 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20310,7 +20159,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_304 [] = {
++static const NSSItem nss_builtins_items_302 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20438,7 +20287,7 @@
+ "\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221"
+ , (PRUint32)1392 }
+ };
+-static const NSSItem nss_builtins_items_305 [] = {
++static const NSSItem nss_builtins_items_303 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20468,7 +20317,7 @@
+   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_306 [] = {
++static const NSSItem nss_builtins_items_304 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20561,7 +20410,7 @@
+ "\342\342\104\276\134\367\352\034\365"
+ , (PRUint32)969 }
+ };
+-static const NSSItem nss_builtins_items_307 [] = {
++static const NSSItem nss_builtins_items_305 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20589,7 +20438,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_308 [] = {
++static const NSSItem nss_builtins_items_306 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20686,7 +20535,7 @@
+ "\364"
+ , (PRUint32)993 }
+ };
+-static const NSSItem nss_builtins_items_309 [] = {
++static const NSSItem nss_builtins_items_307 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20715,7 +20564,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_310 [] = {
++static const NSSItem nss_builtins_items_308 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20813,7 +20662,7 @@
+ "\261\050\272"
+ , (PRUint32)1011 }
+ };
+-static const NSSItem nss_builtins_items_311 [] = {
++static const NSSItem nss_builtins_items_309 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20842,7 +20691,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_312 [] = {
++static const NSSItem nss_builtins_items_310 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20919,7 +20768,7 @@
+ "\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357"
+ , (PRUint32)848 }
+ };
+-static const NSSItem nss_builtins_items_313 [] = {
++static const NSSItem nss_builtins_items_311 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -20943,7 +20792,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_314 [] = {
++static const NSSItem nss_builtins_items_312 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21020,7 +20869,7 @@
+ "\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333"
+ , (PRUint32)848 }
+ };
+-static const NSSItem nss_builtins_items_315 [] = {
++static const NSSItem nss_builtins_items_313 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21044,7 +20893,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_316 [] = {
++static const NSSItem nss_builtins_items_314 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21153,7 +21002,7 @@
+ "\051\340\266\270\011\150\031\034\030\103"
+ , (PRUint32)1354 }
+ };
+-static const NSSItem nss_builtins_items_317 [] = {
++static const NSSItem nss_builtins_items_315 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21177,7 +21026,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_318 [] = {
++static const NSSItem nss_builtins_items_316 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21234,7 +21083,7 @@
+ "\214\171"
+ , (PRUint32)514 }
+ };
+-static const NSSItem nss_builtins_items_319 [] = {
++static const NSSItem nss_builtins_items_317 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21258,7 +21107,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_320 [] = {
++static const NSSItem nss_builtins_items_318 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21348,7 +21197,7 @@
+ "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054"
+ , (PRUint32)959 }
+ };
+-static const NSSItem nss_builtins_items_321 [] = {
++static const NSSItem nss_builtins_items_319 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21375,7 +21224,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_322 [] = {
++static const NSSItem nss_builtins_items_320 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21493,7 +21342,7 @@
+ "\377\276\013\166\026\136\067\067\346\330\164\227\242\231\105\171"
+ , (PRUint32)1440 }
+ };
+-static const NSSItem nss_builtins_items_323 [] = {
++static const NSSItem nss_builtins_items_321 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21519,7 +21368,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_324 [] = {
++static const NSSItem nss_builtins_items_322 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21652,7 +21501,7 @@
+ "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303"
+ , (PRUint32)1679 }
+ };
+-static const NSSItem nss_builtins_items_325 [] = {
++static const NSSItem nss_builtins_items_323 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21678,7 +21527,7 @@
+   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_326 [] = {
++static const NSSItem nss_builtins_items_324 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21772,7 +21621,7 @@
+ "\204\232\315"
+ , (PRUint32)979 }
+ };
+-static const NSSItem nss_builtins_items_327 [] = {
++static const NSSItem nss_builtins_items_325 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21800,7 +21649,7 @@
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+-static const NSSItem nss_builtins_items_328 [] = {
++static const NSSItem nss_builtins_items_326 [] = {
+   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -21884,7 +21733,7 @@
+ "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257"
+ , (PRUint32)895 }
+ };
+-static const NSSItem nss_builtins_items_329 [] = {
++static const NSSItem nss_builtins_items_327 [] = {
+   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+@@ -22242,13 +22091,11 @@
+   { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
+   { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} },
+   { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} },
+-  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} },
+-  { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} },
+-  { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} }
++  { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }
+ };
+ const PRUint32
+ #ifdef DEBUG
+-  nss_builtins_nObjects = 329+1;
++  nss_builtins_nObjects = 327+1;
+ #else
+-  nss_builtins_nObjects = 329;
++  nss_builtins_nObjects = 327;
+ #endif /* DEBUG */
+Index: security/nss/lib/ckfw/builtins/certdata.txt
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.txt,v
+retrieving revision 1.64.2.10
+retrieving revision 1.64.2.11
+diff -u -r1.64.2.10 -r1.64.2.11
+--- security/nss/lib/ckfw/builtins/certdata.txt	1 Aug 2011 06:40:04 -0000	1.64.2.10
++++ security/nss/lib/ckfw/builtins/certdata.txt	30 Aug 2011 20:04:39 -0000	1.64.2.11
+@@ -34,7 +34,7 @@
+ # the terms of any one of the MPL, the GPL or the LGPL.
+ #
+ # ***** END LICENSE BLOCK *****
+-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.10 $ $Date: 2011/08/01 06:40:04 $"
++CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.11 $ $Date: 2011/08/30 20:04:39 $"
+ 
+ #
+ # certdata.txt
+@@ -12461,161 +12461,6 @@
+ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+ 
+ #
+-# Certificate "DigiNotar Root CA"
+-#
+-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+-CKA_TOKEN CK_BBOOL CK_TRUE
+-CKA_PRIVATE CK_BBOOL CK_FALSE
+-CKA_MODIFIABLE CK_BBOOL CK_FALSE
+-CKA_LABEL UTF8 "DigiNotar Root CA"
+-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+-CKA_SUBJECT MULTILINE_OCTAL
+-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
+-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
+-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
+-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
+-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
+-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
+-\154
+-END
+-CKA_ID UTF8 "0"
+-CKA_ISSUER MULTILINE_OCTAL
+-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
+-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
+-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
+-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
+-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
+-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
+-\154
+-END
+-CKA_SERIAL_NUMBER MULTILINE_OCTAL
+-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
+-\074\114
+-END
+-CKA_VALUE MULTILINE_OCTAL
+-\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014
+-\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060
+-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137
+-\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060
+-\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141
+-\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151
+-\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060
+-\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156
+-\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060
+-\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132
+-\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060
+-\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022
+-\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164
+-\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147
+-\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040
+-\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151
+-\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154
+-\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
+-\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
+-\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126
+-\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201
+-\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300
+-\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177
+-\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330
+-\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213
+-\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337
+-\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045
+-\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123
+-\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007
+-\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043
+-\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042
+-\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041
+-\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324
+-\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313
+-\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110
+-\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114
+-\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376
+-\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344
+-\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357
+-\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346
+-\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314
+-\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351
+-\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154
+-\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262
+-\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042
+-\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077
+-\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102
+-\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323
+-\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176
+-\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147
+-\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216
+-\243\002\003\001\000\001\243\102\060\100\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\035\006\003\125
+-\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153
+-\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206
+-\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002
+-\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004
+-\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257
+-\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362
+-\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203
+-\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302
+-\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150
+-\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307
+-\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050
+-\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350
+-\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013
+-\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075
+-\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114
+-\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313
+-\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273
+-\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235
+-\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146
+-\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160
+-\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007
+-\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351
+-\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134
+-\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045
+-\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113
+-\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174
+-\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304
+-\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012
+-\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330
+-\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124
+-\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163
+-\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056
+-\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175
+-\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163
+-\262\345\214\360\206\231\270\345\305\337\204\301\267\353
+-END
+-
+-# Trust for Certificate "DigiNotar Root CA"
+-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+-CKA_TOKEN CK_BBOOL CK_TRUE
+-CKA_PRIVATE CK_BBOOL CK_FALSE
+-CKA_MODIFIABLE CK_BBOOL CK_FALSE
+-CKA_LABEL UTF8 "DigiNotar Root CA"
+-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+-\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317
+-\201\147\107\214
+-END
+-CKA_CERT_MD5_HASH MULTILINE_OCTAL
+-\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230
+-END
+-CKA_ISSUER MULTILINE_OCTAL
+-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
+-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
+-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
+-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
+-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
+-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
+-\154
+-END
+-CKA_SERIAL_NUMBER MULTILINE_OCTAL
+-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
+-\074\114
+-END
+-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+-
+-#
+ # Certificate "Network Solutions Certificate Authority"
+ #
+ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+Index: security/nss/lib/ckfw/builtins/nssckbi.h
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h,v
+retrieving revision 1.24.2.5
+retrieving revision 1.24.2.6
+diff -u -r1.24.2.5 -r1.24.2.6
+--- security/nss/lib/ckfw/builtins/nssckbi.h	1 Aug 2011 06:40:04 -0000	1.24.2.5
++++ security/nss/lib/ckfw/builtins/nssckbi.h	30 Aug 2011 20:04:40 -0000	1.24.2.6
+@@ -77,8 +77,8 @@
+  * of the comment in the CK_VERSION type definition.
+  */
+ #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
+-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 84
+-#define NSS_BUILTINS_LIBRARY_VERSION "1.84"
++#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 85
++#define NSS_BUILTINS_LIBRARY_VERSION "1.85"
+ 
+ /* These version numbers detail the semantic changes to the ckfw engine. */
+ #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1