backout d30b2e9c999a
authorKai Engert <kaie@kuix.de>
Wed, 04 May 2011 13:06:30 +0200
changeset 68946 85da10660bc50ad054f9c4ec33f8f67f69402a1c
parent 68945 0e25d6182131f6318a5c5a9d82a718c22a23783c
child 68947 852a668d69b9cac674b7c590c6417a9c8448a7ac
child 69192 35aee8daa8bfc86d688ae6da338ac5c3577f0c86
push idunknown
push userunknown
push dateunknown
milestone6.0a1
backs outd30b2e9c999a43ffa9abf7429a27432430813738
backout d30b2e9c999a
nsprpub/TAG-INFO
nsprpub/config/prdepend.h
nsprpub/configure
nsprpub/configure.in
nsprpub/pr/include/prio.h
nsprpub/pr/include/prtypes.h
nsprpub/pr/src/pthreads/ptio.c
security/coreconf/Darwin.mk
security/coreconf/coreconf.dep
security/nss/TAG-INFO
security/nss/cmd/addbuiltin/addbuiltin.c
security/nss/cmd/certutil/certutil.c
security/nss/cmd/lib/secutil.c
security/nss/cmd/lib/secutil.h
security/nss/cmd/selfserv/selfserv.c
security/nss/cmd/shlibsign/shlibsign.c
security/nss/cmd/strsclnt/strsclnt.c
security/nss/cmd/tstclnt/tstclnt.c
security/nss/lib/certdb/cert.h
security/nss/lib/certdb/stanpcertdb.c
security/nss/lib/certhigh/certhigh.c
security/nss/lib/certhigh/certvfypkix.c
security/nss/lib/ckfw/builtins/certdata.c
security/nss/lib/ckfw/builtins/certdata.txt
security/nss/lib/ckfw/builtins/nssckbi.h
security/nss/lib/cryptohi/seckey.c
security/nss/lib/freebl/blapit.h
security/nss/lib/freebl/mpi/mpi-config.h
security/nss/lib/freebl/mpi/mpi.c
security/nss/lib/freebl/mpi/mpi_amd64_gas.s
security/nss/lib/freebl/mpi/mpi_amd64_sun.s
security/nss/lib/freebl/nsslowhash.c
security/nss/lib/freebl/rsa.c
security/nss/lib/freebl/sha512.c
security/nss/lib/freebl/stubs.c
security/nss/lib/freebl/stubs.h
security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c
security/nss/lib/libpkix/pkix/top/pkix_build.c
security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
security/nss/lib/nss/nss.def
security/nss/lib/nss/nss.h
security/nss/lib/pk11wrap/Makefile
security/nss/lib/pk11wrap/debug_module.c
security/nss/lib/pk11wrap/pk11load.c
security/nss/lib/pk11wrap/pk11pars.c
security/nss/lib/pk11wrap/pk11priv.h
security/nss/lib/pk11wrap/pk11slot.c
security/nss/lib/pk11wrap/pk11util.c
security/nss/lib/pk11wrap/secmodi.h
security/nss/lib/pki/pki3hack.c
security/nss/lib/pki/pki3hack.h
security/nss/lib/smime/cms.h
security/nss/lib/smime/cmsasn1.c
security/nss/lib/smime/cmscinfo.c
security/nss/lib/smime/cmsdecode.c
security/nss/lib/smime/cmsdigdata.c
security/nss/lib/smime/cmsencdata.c
security/nss/lib/smime/cmsencode.c
security/nss/lib/smime/cmsenvdata.c
security/nss/lib/smime/cmslocal.h
security/nss/lib/smime/cmsmessage.c
security/nss/lib/smime/cmssigdata.c
security/nss/lib/smime/cmst.h
security/nss/lib/smime/cmsudf.c
security/nss/lib/smime/cmsutil.c
security/nss/lib/smime/manifest.mn
security/nss/lib/smime/smime.def
security/nss/lib/smime/smime.h
security/nss/lib/softoken/pkcs11.c
security/nss/lib/softoken/rsawrapr.c
security/nss/lib/softoken/softkver.h
security/nss/lib/ssl/derive.c
security/nss/lib/ssl/ssl.def
security/nss/lib/ssl/ssl.h
security/nss/lib/ssl/ssl3con.c
security/nss/lib/ssl/ssl3ext.c
security/nss/lib/ssl/sslcon.c
security/nss/lib/ssl/sslimpl.h
security/nss/lib/ssl/sslnonce.c
security/nss/lib/ssl/sslsecur.c
security/nss/lib/ssl/sslsnce.c
security/nss/lib/ssl/sslsock.c
security/nss/lib/sysinit/nsssysinit.c
security/nss/lib/util/nssb64d.c
security/nss/lib/util/nssutil.h
security/nss/lib/util/secasn1e.c
security/nss/tests/chains/ocspd-config/readme
security/nss/tests/libpkix/certs/OCSPCA1.cert
security/nss/tests/libpkix/certs/OCSPCA1.p12
security/nss/tests/libpkix/certs/OCSPCA2.cert
security/nss/tests/libpkix/certs/OCSPCA2.p12
security/nss/tests/libpkix/certs/OCSPCA3.cert
security/nss/tests/libpkix/certs/OCSPCA3.p12
security/nss/tests/libpkix/certs/OCSPEE11.cert
security/nss/tests/libpkix/certs/OCSPEE12.cert
security/nss/tests/libpkix/certs/OCSPEE13.cert
security/nss/tests/libpkix/certs/OCSPEE14.cert
security/nss/tests/libpkix/certs/OCSPEE15.cert
security/nss/tests/libpkix/certs/OCSPEE21.cert
security/nss/tests/libpkix/certs/OCSPEE22.cert
security/nss/tests/libpkix/certs/OCSPEE23.cert
security/nss/tests/libpkix/certs/OCSPEE31.cert
security/nss/tests/libpkix/certs/OCSPEE32.cert
security/nss/tests/libpkix/certs/OCSPEE33.cert
security/nss/tests/libpkix/certs/OCSPRoot.cert
security/nss/tests/libpkix/certs/OCSPRoot.p12
security/nss/tests/libpkix/certs/PayPalEE.cert
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1,1 +1,1 @@
-NSPR_4_8_8_BETA3
+NSPR_4_8_8_BETA2
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -37,9 +37,8 @@
 
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSPR in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
-
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -3536,22 +3536,20 @@ EOF
     CFLAGS="$CFLAGS -Wall -fno-common"
     case "${target_cpu}" in
         i*86*)
             if test -n "$USE_64"; then
                 CPU_ARCH=x86_64
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
-                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
-            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
     DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
     _OPTIMIZE_FLAGS=-O2
     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
     STRIP="$STRIP -x -S"
     DLL_SUFFIX=dylib
@@ -4736,27 +4734,27 @@ EOF
     if test -z "$GNU_CC"; then
         CC="$CC -std1 -ieee_with_inexact"
         if test "$OS_RELEASE" != "V2.0"; then
             CC="$CC -readonly_strings"
         fi
         _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"
         ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
-echo "configure:4745: checking for machine/builtins.h" >&5
+echo "configure:4743: checking for machine/builtins.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4750 "configure"
+#line 4748 "configure"
 #include "confdefs.h"
 #include <machine/builtins.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
 else
   echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
@@ -5395,63 +5393,63 @@ if test -z "$SKIP_LIBRARY_CHECKS"; then
 
 
 
 case $target in
 *-darwin*|*-beos*|*-os2*)
     ;;
 *)
     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:5404: checking for dlopen in -ldl" >&5
+echo "configure:5402: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5412 "configure"
+#line 5410 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char dlopen();
 
 int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:5423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
 LIBS="$ac_save_LIBS"
 
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:5440: checking for dlfcn.h" >&5
+echo "configure:5438: checking for dlfcn.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5445 "configure"
+#line 5443 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
 else
   echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
@@ -5474,23 +5472,23 @@ fi
     ;;
 esac
 
 
 
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:5483: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:5481: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 5489 "configure"
+#line 5487 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "$ac_pattern" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_prog_gcc_traditional=yes
@@ -5498,17 +5496,17 @@ else
   rm -rf conftest*
   ac_cv_prog_gcc_traditional=no
 fi
 rm -f conftest*
 
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 5507 "configure"
+#line 5505 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "$ac_pattern" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_prog_gcc_traditional=yes
@@ -5522,22 +5520,22 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
 for ac_func in lchown strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5531: checking for $ac_func" >&5
+echo "configure:5529: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5536 "configure"
+#line 5534 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
@@ -5550,17 +5548,17 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 $ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:5559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=no"
 fi
@@ -5601,17 +5599,17 @@ if test "$CCACHE" != "no"; then
             fi
         fi
     fi
     for ac_prog in $CCACHE ccache
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5610: checking for $ac_word" >&5
+echo "configure:5608: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$CCACHE" in
   /*)
   ac_cv_path_CCACHE="$CCACHE" # Let the user override the test with a path.
   ;;
   ?:/*)			 
@@ -5660,17 +5658,17 @@ if test "${enable_strip+set}" = set; the
 fi
 
 
 case "${target_os}" in
 hpux*)
 if test -z "$GNU_CC"; then
 
     echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
-echo "configure:5669: checking for +Olit support" >&5
+echo "configure:5667: checking for +Olit support" >&5
 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
                   ac_cv_hpux_usable_olit_option=no
         rm -f conftest*
         echo 'int main() { return 0; }' | cat > conftest.c
         ${CC-cc} ${CFLAGS} +Olit=all -o conftest conftest.c > conftest.out 2>&1
         if test $? -eq 0; then
@@ -5702,17 +5700,17 @@ darwin*)
     _HAVE_PTHREADS=1
     ;;
 wince*)
     _HAVE_PTHREADS=
     ;;
 *)
     
 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:5711: checking for pthread_create in -lpthreads" >&5
+echo "configure:5709: checking for pthread_create in -lpthreads" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
     int main() { 
         pthread_t t;
         if (!pthread_create(&t, 0, &foo, 0)) {
             pthread_join(t, 0);
         }
@@ -5724,17 +5722,17 @@ echo "
     rm -f dummy.c dummy${ac_exeext} ;
     if test "$_res" = "0"; then
         echo "$ac_t""yes" 1>&6
         _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads"
     else
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:5733: checking for pthread_create in -lpthread" >&5
+echo "configure:5731: checking for pthread_create in -lpthread" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
     int main() { 
         pthread_t t;
         if (!pthread_create(&t, 0, &foo, 0)) {
             pthread_join(t, 0);
         }
@@ -5746,17 +5744,17 @@ echo "
     rm -f dummy.c dummy${ac_exeext} ;
     if test "$_res" = "0"; then
         echo "$ac_t""yes" 1>&6
         _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread"
     else
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:5755: checking for pthread_create in -lc_r" >&5
+echo "configure:5753: checking for pthread_create in -lc_r" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
     int main() { 
         pthread_t t;
         if (!pthread_create(&t, 0, &foo, 0)) {
             pthread_join(t, 0);
         }
@@ -5768,17 +5766,17 @@ echo "
     rm -f dummy.c dummy${ac_exeext} ;
     if test "$_res" = "0"; then
         echo "$ac_t""yes" 1>&6
         _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r"
     else
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
-echo "configure:5777: checking for pthread_create in -lc" >&5
+echo "configure:5775: checking for pthread_create in -lc" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
     int main() { 
         pthread_t t;
         if (!pthread_create(&t, 0, &foo, 0)) {
             pthread_join(t, 0);
         }
@@ -5886,17 +5884,17 @@ if test "${enable_ipv6+set}" = set; then
       fi
 fi
 
 
 if test -n "$USE_PTHREADS"; then
       rm -f conftest*
    ac_cv_have_dash_pthread=no
    echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
-echo "configure:5895: checking whether ${CC-cc} accepts -pthread" >&5
+echo "configure:5893: checking whether ${CC-cc} accepts -pthread" >&5
    echo 'int main() { return 0; }' | cat > conftest.c
    ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
    if test $? -eq 0; then
 	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
 	    ac_cv_have_dash_pthread=yes
 		case "$target_os" in
 	    freebsd*)
 # Freebsd doesn't use -pthread for compiles, it uses them for linking
@@ -5909,17 +5907,17 @@ echo "configure:5895: checking whether $
 	fi
     fi
     rm -f conftest*
     echo "$ac_t""$ac_cv_have_dash_pthread" 1>&6
 
 			    ac_cv_have_dash_pthreads=no
     if test "$ac_cv_have_dash_pthread" = "no"; then
 	    echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
-echo "configure:5918: checking whether ${CC-cc} accepts -pthreads" >&5
+echo "configure:5916: checking whether ${CC-cc} accepts -pthreads" >&5
     	echo 'int main() { return 0; }' | cat > conftest.c
 	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
     	if test $? -eq 0; then
 	    	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthreads`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
 			    ac_cv_have_dash_pthreads=yes
 			    CFLAGS="$CFLAGS -pthreads"
 			    CXXFLAGS="$CXXFLAGS -pthreads"
 		    fi
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1139,22 +1139,20 @@ case "$target" in
     CFLAGS="$CFLAGS -Wall -fno-common"
     case "${target_cpu}" in
         i*86*)
             if test -n "$USE_64"; then
                 CPU_ARCH=x86_64
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
-                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
-            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
     DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
     _OPTIMIZE_FLAGS=-O2
     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
     STRIP="$STRIP -x -S"
     DLL_SUFFIX=dylib
--- a/nsprpub/pr/include/prio.h
+++ b/nsprpub/pr/include/prio.h
@@ -137,19 +137,16 @@ typedef enum PRTransmitFileFlags {
 ** Define PR_AF_INET6 in prcpucfg.h with the same
 ** value as AF_INET6 on platforms with IPv6 support.
 ** Otherwise define it here.
 */
 #ifndef PR_AF_INET6
 #define PR_AF_INET6 100
 #endif
 
-#define PR_AF_INET_SDP 101
-#define PR_AF_INET6_SDP 102
-
 #ifndef PR_AF_UNSPEC
 #define PR_AF_UNSPEC 0
 #endif
 
 /*
 **************************************************************************
 ** A network address
 **
--- a/nsprpub/pr/include/prtypes.h
+++ b/nsprpub/pr/include/prtypes.h
@@ -230,17 +230,17 @@
 
 PR_BEGIN_EXTERN_C
 
 /************************************************************************
 ** TYPES:       PRUint8
 **              PRInt8
 ** DESCRIPTION:
 **  The int8 types are known to be 8 bits each. There is no type that
-**      is equivalent to a plain "char".
+**      is equivalent to a plain "char". 
 ************************************************************************/
 #if PR_BYTES_PER_BYTE == 1
 typedef unsigned char PRUint8;
 /*
 ** Some cfront-based C++ compilers do not like 'signed char' and
 ** issue the warning message:
 **     warning: "signed" not implemented (ignored)
 ** For these compilers, we have to define PRInt8 as plain 'char'.
@@ -269,17 +269,17 @@ typedef signed char PRInt8;
 #define PR_INT8_MAX 127
 #define PR_INT8_MIN (-128)
 #define PR_UINT8_MAX 255U
 
 /************************************************************************
 ** TYPES:       PRUint16
 **              PRInt16
 ** DESCRIPTION:
-**  The int16 types are known to be 16 bits each.
+**  The int16 types are known to be 16 bits each. 
 ************************************************************************/
 #if PR_BYTES_PER_SHORT == 2
 typedef unsigned short PRUint16;
 typedef short PRInt16;
 #else
 #error No suitable type for PRInt16/PRUint16
 #endif
 
@@ -294,17 +294,17 @@ typedef short PRInt16;
 #define PR_INT16_MAX 32767
 #define PR_INT16_MIN (-32768)
 #define PR_UINT16_MAX 65535U
 
 /************************************************************************
 ** TYPES:       PRUint32
 **              PRInt32
 ** DESCRIPTION:
-**  The int32 types are known to be 32 bits each.
+**  The int32 types are known to be 32 bits each. 
 ************************************************************************/
 #if PR_BYTES_PER_INT == 4
 typedef unsigned int PRUint32;
 typedef int PRInt32;
 #define PR_INT32(x)  x
 #define PR_UINT32(x) x ## U
 #elif PR_BYTES_PER_LONG == 4
 typedef unsigned long PRUint32;
@@ -367,90 +367,90 @@ typedef PRInt64 PRUint64;
 
 /************************************************************************
 ** TYPES:       PRUintn
 **              PRIntn
 ** DESCRIPTION:
 **  The PRIntn types are most appropriate for automatic variables. They are
 **      guaranteed to be at least 16 bits, though various architectures may
 **      define them to be wider (e.g., 32 or even 64 bits). These types are
-**      never valid for fields of a structure.
+**      never valid for fields of a structure. 
 ************************************************************************/
 #if PR_BYTES_PER_INT >= 2
 typedef int PRIntn;
 typedef unsigned int PRUintn;
 #else
 #error 'sizeof(int)' not sufficient for platform use
 #endif
 
 /************************************************************************
 ** TYPES:       PRFloat64
 ** DESCRIPTION:
-**  NSPR's floating point type is always 64 bits.
+**  NSPR's floating point type is always 64 bits. 
 ************************************************************************/
 typedef double          PRFloat64;
 
 /************************************************************************
 ** TYPES:       PRSize
 ** DESCRIPTION:
-**  A type for representing the size of objects.
+**  A type for representing the size of objects. 
 ************************************************************************/
 typedef size_t PRSize;
 
 
 /************************************************************************
 ** TYPES:       PROffset32, PROffset64
 ** DESCRIPTION:
-**  A type for representing byte offsets from some location.
+**  A type for representing byte offsets from some location. 
 ************************************************************************/
 typedef PRInt32 PROffset32;
 typedef PRInt64 PROffset64;
 
 /************************************************************************
 ** TYPES:       PRPtrDiff
 ** DESCRIPTION:
 **  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer subtraction.
+**      for storing a pointer or pointer subtraction. 
 ************************************************************************/
 typedef ptrdiff_t PRPtrdiff;
 
 /************************************************************************
 ** TYPES:       PRUptrdiff
 ** DESCRIPTION:
 **  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer sutraction.
+**      for storing a pointer or pointer sutraction. 
 ************************************************************************/
 #ifdef _WIN64
 typedef PRUint64 PRUptrdiff;
 #else
 typedef unsigned long PRUptrdiff;
 #endif
 
 /************************************************************************
 ** TYPES:       PRBool
 ** DESCRIPTION:
 **  Use PRBool for variables and parameter types. Use PR_FALSE and PR_TRUE
 **      for clarity of target type in assignments and actual arguments. Use
 **      'if (bool)', 'while (!bool)', '(bool) ? x : y' etc., to test booleans
-**      just as you would C int-valued conditions.
+**      just as you would C int-valued conditions. 
 ************************************************************************/
 typedef PRIntn PRBool;
 #define PR_TRUE 1
 #define PR_FALSE 0
 
 /************************************************************************
 ** TYPES:       PRPackedBool
 ** DESCRIPTION:
 **  Use PRPackedBool within structs where bitfields are not desirable
 **      but minimum and consistant overhead matters.
 ************************************************************************/
 typedef PRUint8 PRPackedBool;
 
 /*
-** Status code used by some routines that have a single point of failure or
+** Status code used by some routines that have a single point of failure or 
 ** special status return.
 */
 typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;
 
 #ifndef __PRUNICHAR__
 #define __PRUNICHAR__
 #ifdef WIN32
 typedef wchar_t PRUnichar;
--- a/nsprpub/pr/src/pthreads/ptio.c
+++ b/nsprpub/pr/src/pthreads/ptio.c
@@ -213,30 +213,16 @@ static PRBool _pr_ipv6_v6only_on_by_defa
     || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
     || defined(BSDI) || defined(NTO) || defined(DARWIN) \
     || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN)
 #define _PRSelectFdSetArg_t fd_set *
 #else
 #error "Cannot determine architecture"
 #endif
 
-#if defined(SOLARIS)            
-#ifndef PROTO_SDP
-/* on solaris, SDP is a new type of protocol */
-#define PROTO_SDP   257
-#endif 
-#define _PR_HAVE_SDP
-#elif defined(LINUX)
-#ifndef AF_INET_SDP
-/* on linux, SDP is a new type of address family */
-#define AF_INET_SDP 27
-#endif
-#define _PR_HAVE_SDP
-#endif /* LINUX */
-
 static PRFileDesc *pt_SetMethods(
     PRIntn osfd, PRDescType type, PRBool isAcceptedSocket, PRBool imported);
 
 static PRLock *_pr_flock_lock;  /* For PR_LockFile() etc. */
 static PRCondVar *_pr_flock_cv;  /* For PR_LockFile() etc. */
 static PRLock *_pr_rename_lock;  /* For PR_Rename() */
 
 /**************************************************************************/
@@ -3471,48 +3457,28 @@ PR_IMPLEMENT(PRFileDesc*) PR_Socket(PRIn
 #endif
 
     if (!_pr_initialized) _PR_ImplicitInitialization();
 
     if (pt_TestAbort()) return NULL;
 
     if (PF_INET != domain
         && PR_AF_INET6 != domain
-#if defined(_PR_HAVE_SDP)
-        && PR_AF_INET_SDP != domain
-#if defined(SOLARIS)
-        && PR_AF_INET6_SDP != domain
-#endif /* SOLARIS */
-#endif /* _PR_HAVE_SDP */
         && PF_UNIX != domain)
     {
         PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
         return fd;
     }
 	if (type == SOCK_STREAM) ftype = PR_DESC_SOCKET_TCP;
 	else if (type == SOCK_DGRAM) ftype = PR_DESC_SOCKET_UDP;
 	else
 	{
 		(void)PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
 		return fd;
 	}
-#if defined(_PR_HAVE_SDP)
-#if defined(LINUX)
-    if (PR_AF_INET_SDP == domain)
-        domain = AF_INET_SDP;
-#elif defined(SOLARIS)
-    if (PR_AF_INET_SDP == domain) {
-        domain = AF_INET;
-        proto = PROTO_SDP;
-    } else if(PR_AF_INET6_SDP == domain) {
-        domain = AF_INET6;
-        proto = PROTO_SDP;
-    }
-#endif /* SOLARIS */
-#endif /* _PR_HAVE_SDP */
 #if defined(_PR_INET6_PROBE)
 	if (PR_AF_INET6 == domain)
 		domain = _pr_ipv6_is_present() ? AF_INET6 : AF_INET;
 #elif defined(_PR_INET6) 
 	if (PR_AF_INET6 == domain)
 		domain = AF_INET6;
 #else
 	if (PR_AF_INET6 == domain)
--- a/security/coreconf/Darwin.mk
+++ b/security/coreconf/Darwin.mk
@@ -49,25 +49,23 @@ ifndef CPU_ARCH
 CPU_ARCH	:= $(shell uname -p)
 endif
 
 ifeq (,$(filter-out i%86,$(CPU_ARCH)))
 ifdef USE_64
 CC              += -arch x86_64
 else
 OS_REL_CFLAGS	= -Di386
-CC              += -arch i386
 endif
 else
 OS_REL_CFLAGS	= -Dppc
-CC              += -arch ppc
 endif
 
 ifneq (,$(MACOS_SDK_DIR))
-    GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
+    GCC_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "gcc version" | sed -e "s/^.*gcc version[  ]*//" | awk '{ print $$1 }')
     GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }')
     GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }')
     GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR)
 
     ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
         # GCC <= 3
         DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks
         ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0))
--- a/security/coreconf/coreconf.dep
+++ b/security/coreconf/coreconf.dep
@@ -38,8 +38,10 @@
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSS in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
 
+
+
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1,1 +1,1 @@
-NSS_3_12_10_BETA1
+NSS_3_12_9_RTM
--- a/security/nss/cmd/addbuiltin/addbuiltin.c
+++ b/security/nss/cmd/addbuiltin/addbuiltin.c
@@ -32,17 +32,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 /*
  * Tool for converting builtin CA certs.
  *
- * $Id: addbuiltin.c,v 1.14.68.1 2011/03/23 20:07:57 kaie%kuix.de Exp $
+ * $Id: addbuiltin.c,v 1.14 2007/02/14 00:35:52 alexei.volkov.bugs%sun.com Exp $
  */
 
 #include "nssrenam.h"
 #include "nss.h"
 #include "cert.h"
 #include "certdb.h"
 #include "secutil.h"
 #include "pk11func.h"
@@ -72,18 +72,16 @@ char *getTrustString(unsigned int trust)
 	} else {
 		return "CKT_NETSCAPE_TRUSTED";
 	}
     } else {
 	if (trust & CERTDB_TRUSTED_CA) {
 		return "CKT_NETSCAPE_TRUSTED_DELEGATOR";
 	} else if (trust & CERTDB_VALID_CA) {
 		return "CKT_NETSCAPE_VALID_DELEGATOR";
-	} else if (trust & CERTDB_VALID_PEER) {
-		return "CKT_NETSCAPE_VALID";
 	} else {
 		return "CKT_NETSCAPE_TRUST_UNKNOWN";
 	}
     }
     return "CKT_NETSCAPE_TRUST_UNKNOWN"; /* not reached */
 }
 
 static const SEC_ASN1Template serialTemplate[] = {
@@ -210,17 +208,17 @@ void printheader() {
 "# use your version of this file under the terms of the MPL, indicate your\n"
 "# decision by deleting the provisions above and replace them with the notice\n"
 "# and other provisions required by the GPL or the LGPL. If you do not delete\n"
 "# the provisions above, a recipient may use your version of this file under\n"
 "# the terms of any one of the MPL, the GPL or the LGPL.\n"
 "#\n"
 "# ***** END LICENSE BLOCK *****\n"
      "#\n"
-     "CVS_ID \"@(#) $RCSfile: addbuiltin.c,v $ $Revision: 1.14.68.1 $ $Date: 2011/03/23 20:07:57 $\"\n"
+     "CVS_ID \"@(#) $RCSfile: addbuiltin.c,v $ $Revision: 1.14 $ $Date: 2007/02/14 00:35:52 $\"\n"
      "\n"
      "#\n"
      "# certdata.txt\n"
      "#\n"
      "# This file contains the object definitions for the certs and other\n"
      "# information \"built into\" NSS.\n"
      "#\n"
      "# Object definitions:\n"
--- a/security/nss/cmd/certutil/certutil.c
+++ b/security/nss/cmd/certutil/certutil.c
@@ -980,17 +980,17 @@ ListModules(void)
       printf ("   token: %s\n", PK11_GetTokenName(le->slot));
     }
     PK11_FreeSlotList(list);
 
     return SECSuccess;
 }
 
 static void 
-PrintSyntax(char *progName)
+Usage(char *progName)
 {
 #define FPS fprintf(stderr, 
     FPS "Type %s -H for more detailed descriptions\n", progName);
     FPS "Usage:  %s -N [-d certdir] [-P dbprefix] [-f pwfile]\n", progName);
     FPS "Usage:  %s -T [-d certdir] [-P dbprefix] [-h token-name]\n"
 	"\t\t [-f pwfile] [-0 SSO-password]\n", progName);
     FPS "\t%s -A -n cert-name -t trustargs [-d certdir] [-P dbprefix] [-a] [-i input]\n", 
     	progName);
@@ -1050,180 +1050,131 @@ PrintSyntax(char *progName)
         "\t\t [-p phone] [-1] [-2] [-3] [-4] [-5] [-6] [-7 emailAddrs]\n"
         "\t\t [-8 DNS-names]\n"
         "\t\t [--extAIA] [--extSIA] [--extCP] [--extPM] [--extPC] [--extIA]\n"
         "\t\t [--extSKID]\n", progName);
     FPS "\t%s -U [-X] [-d certdir] [-P dbprefix]\n", progName);
     exit(1);
 }
 
-enum usage_level {
-    usage_all = 0, usage_selected = 1
-};
-
-static void luCommonDetailsAE();
-
-static void luA(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "A"));
-    if (ul == usage_all || !command || is_my_command)
-    FPS "%-15s Add a certificate to the database        (create if needed)\n",
-        "-A");
-    if (ul == usage_selected && !is_my_command)
-        return;
-    if (ul == usage_all) {
-    FPS "%-20s\n", "   All options under -E apply");
-    }
-    else {
-        luCommonDetailsAE();
-    }
-}
-
-static void luB(enum usage_level ul, const char *command)
+static void LongUsage(char *progName)
 {
-    int is_my_command = (command && 0 == strcmp(command, "B"));
-    if (ul == usage_all || !command || is_my_command)
+
+    FPS "%-15s Add a certificate to the database        (create if needed)\n",
+	"-A");
+    FPS "%-20s\n", "   All options under -E apply");
     FPS "%-15s Run a series of certutil commands from a batch file\n", "-B");
-    if (ul == usage_selected && !is_my_command)
-        return;
     FPS "%-20s Specify the batch file\n", "   -i batch-file");
-}
-
-static void luE(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "E"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Add an Email certificate to the database (create if needed)\n",
-        "-E");
-    if (ul == usage_selected && !is_my_command)
-        return;
-    luCommonDetailsAE();
-}
-
-static void luCommonDetailsAE()
-{
+	"-E");
     FPS "%-20s Specify the nickname of the certificate to add\n",
-        "   -n cert-name");
+	"   -n cert-name");
     FPS "%-20s Set the certificate trust attributes:\n",
-        "   -t trustargs");
+	"   -t trustargs");
     FPS "%-25s trustargs is of the form x,y,z where x is for SSL, y is for S/MIME,\n", "");
-    FPS "%-25s and z is for code signing. Use ,, for no explicit trust.\n", "");
+    FPS "%-25s and z is for code signing\n", "");
     FPS "%-25s p \t valid peer\n", "");
     FPS "%-25s P \t trusted peer (implies p)\n", "");
     FPS "%-25s c \t valid CA\n", "");
     FPS "%-25s T \t trusted CA to issue client certs (implies c)\n", "");
     FPS "%-25s C \t trusted CA to issue server certs (implies c)\n", "");
     FPS "%-25s u \t user cert\n", "");
     FPS "%-25s w \t send warning\n", "");
     FPS "%-25s g \t make step-up cert\n", "");
     FPS "%-20s Specify the password file\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s The input certificate is encoded in ASCII (RFC1113)\n",
-        "   -a");
+	"   -a");
     FPS "%-20s Specify the certificate file (default is stdin)\n",
-        "   -i input");
+	"   -i input");
     FPS "\n");
-}
 
-static void luC(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "C"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Create a new binary certificate from a BINARY cert request\n",
-        "-C");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-C");
     FPS "%-20s The nickname of the issuer cert\n",
-        "   -c issuer-name");
+	"   -c issuer-name");
     FPS "%-20s The BINARY certificate request file\n",
-        "   -i cert-request ");
+	"   -i cert-request ");
     FPS "%-20s Output binary cert to this file (default is stdout)\n",
-        "   -o output-cert");
+	"   -o output-cert");
     FPS "%-20s Self sign\n",
-        "   -x");
+	"   -x");
     FPS "%-20s Cert serial number\n",
-        "   -m serial-number");
+	"   -m serial-number");
     FPS "%-20s Time Warp\n",
-        "   -w warp-months");
+	"   -w warp-months");
     FPS "%-20s Months valid (default is 3)\n",
         "   -v months-valid");
     FPS "%-20s Specify the password file\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s \n"
               "%-20s Create key usage extension. Possible keywords:\n"
               "%-20s \"digitalSignature\", \"nonRepudiation\", \"keyEncipherment\",\n"
               "%-20s \"dataEncipherment\", \"keyAgreement\", \"certSigning\",\n"
               "%-20s \"crlSigning\", \"critical\"\n",
         "   -1 | --keyUsage keyword,keyword,...", "", "", "", "");
     FPS "%-20s Create basic constraint extension\n",
-        "   -2 ");
+	"   -2 ");
     FPS "%-20s Create authority key ID extension\n",
-        "   -3 ");
+	"   -3 ");
     FPS "%-20s Create crl distribution point extension\n",
-        "   -4 ");
+	"   -4 ");
     FPS "%-20s \n"
               "%-20s Create netscape cert type extension. Possible keywords:\n"
               "%-20s \"sslClient\", \"sslServer\", \"smime\", \"objectSigning\",\n"
               "%-20s \"sslCA\", \"smimeCA\", \"objectSigningCA\", \"critical\".\n",
         "   -5 | -nsCertType keyword,keyword,... ", "", "", "");
     FPS "%-20s \n"
               "%-20s Create extended key usage extension. Possible keywords:\n"
               "%-20s \"serverAuth\", \"clientAuth\",\"codeSigning\",\n"
               "%-20s \"emailProtection\", \"timeStamp\",\"ocspResponder\",\n"
               "%-20s \"stepUp\", \"critical\"\n",
-        "   -6 | --extKeyUsage keyword,keyword,...", "", "", "", "");
+	"   -6 | --extKeyUsage keyword,keyword,...", "", "", "", "");
     FPS "%-20s Create an email subject alt name extension\n",
-        "   -7 emailAddrs");
+	"   -7 emailAddrs");
     FPS "%-20s Create an dns subject alt name extension\n",
-        "   -8 dnsNames");
+	"   -8 dnsNames");
     FPS "%-20s The input certificate request is encoded in ASCII (RFC1113)\n",
-        "   -a");
+	"   -a");
     FPS "\n");
-}
 
-static void luG(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "G"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Generate a new key pair\n",
-        "-G");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-G");
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-        "   -h token-name");
+	"   -h token-name");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
-        "   -k key-type");
+	"   -k key-type");
     FPS "%-20s Key size in bits, (min %d, max %d, default %d) (not for ec)\n",
-        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
-        "   -k key-type");
+	"   -k key-type");
     FPS "%-20s Key size in bits, (min %d, max %d, default %d)\n",
-        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Set the public exponent value (3, 17, 65537) (rsa only)\n",
-        "   -y exp");
+	"   -y exp");
     FPS "%-20s Specify the password file\n",
         "   -f password-file");
     FPS "%-20s Specify the noise file to be used\n",
-        "   -z noisefile");
+	"   -z noisefile");
     FPS "%-20s read PQG value from pqgfile (dsa only)\n",
-        "   -q pqgfile");
+	"   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-        "   -q curve-name");
+	"   -q curve-name");
     FPS "%-20s One of nistp256, nistp384, nistp521\n", "");
 #ifdef NSS_ECC_MORE_THAN_SUITE_B
     FPS "%-20s sect163k1, nistk163, sect163r1, sect163r2,\n", "");
     FPS "%-20s nistb163, sect193r1, sect193r2, sect233k1, nistk233,\n", "");
     FPS "%-20s sect233r1, nistb233, sect239k1, sect283k1, nistk283,\n", "");
     FPS "%-20s sect283r1, nistb283, sect409k1, nistk409, sect409r1,\n", "");
     FPS "%-20s nistb409, sect571k1, nistk571, sect571r1, nistb571,\n", "");
     FPS "%-20s secp160k1, secp160r1, secp160r2, secp192k1, secp192r1,\n", "");
@@ -1236,456 +1187,319 @@ static void luG(enum usage_level ul, con
     FPS "%-20s c2pnb208w1, c2tnb239v1, c2tnb239v2, c2tnb239v3, \n", "");
     FPS "%-20s c2pnb272w1, c2pnb304w1, \n", "");
     FPS "%-20s c2tnb359w1, c2pnb368w1, c2tnb431r1, secp112r1, \n", "");
     FPS "%-20s secp112r2, secp128r1, secp128r2, sect113r1, sect113r2\n", "");
     FPS "%-20s sect131r1, sect131r2\n", "");
 #endif /* NSS_ECC_MORE_THAN_SUITE_B */
 #endif
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-        "   -d keydir");
+	"   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
-    FPS "\n");
-}
-
-static void luD(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "D"));
-    if (ul == usage_all || !command || is_my_command)
-    FPS "%-15s Delete a certificate from the database\n",
-        "-D");
-    if (ul == usage_selected && !is_my_command)
-        return;
-    FPS "%-20s The nickname of the cert to delete\n",
-        "   -n cert-name");
-    FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
-    FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "\n");
 
-}
+    FPS "%-15s Delete a certificate from the database\n",
+	"-D");
+    FPS "%-20s The nickname of the cert to delete\n",
+	"   -n cert-name");
+    FPS "%-20s Cert database directory (default is ~/.netscape)\n",
+	"   -d certdir");
+    FPS "%-20s Cert & Key database prefix\n",
+	"   -P dbprefix");
+    FPS "\n");
 
-static void luU(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "U"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all modules\n", /*, or print out a single named module\n",*/
         "-U");
-    if (ul == usage_selected && !is_my_command)
-        return;
     FPS "%-20s Module database directory (default is '~/.netscape')\n",
         "   -d moddir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-        "   -X");
+	"   -X");
     FPS "\n");
 
-}
-
-static void luK(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "K"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all private keys\n",
         "-K");
-    if (ul == usage_selected && !is_my_command)
-        return;
-    FPS "%-20s Name of token to search (\"all\" for all tokens)\n",
-        "   -h token-name ");
+          FPS "%-20s Name of token to search (\"all\" for all tokens)\n",
+	"   -h token-name ");
 
     FPS "%-20s Key type (\"all\" (default), \"dsa\","
 #ifdef NSS_ENABLE_ECC
                                                     " \"ec\","
 #endif
-                                                    " \"rsa\")\n",
-        "   -k key-type");
+                                                             " \"rsa\")\n",
+	"   -k key-type");
     FPS "%-20s The nickname of the key or associated certificate\n",
-        "   -n name");
+	"   -n name");
     FPS "%-20s Specify the password file\n",
         "   -f password-file");
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-        "   -d keydir");
+	"   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-        "   -X");
+	"   -X");
     FPS "\n");
-}
 
-static void luL(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "L"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all certs, or print out a single named cert\n",
-        "-L");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-L");
     FPS "%-20s Pretty print named cert (list all if unspecified)\n",
-        "   -n cert-name");
+	"   -n cert-name");
     FPS "%-20s \n"
               "%-20s Pretty print cert with email address (list all if unspecified)\n",
-        "   --email email-address", "");
+	"   --email email-address", "");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-        "   -X");
+	"   -X");
     FPS "%-20s For single cert, print binary DER encoding\n",
-        "   -r");
+	"   -r");
     FPS "%-20s For single cert, print ASCII encoding (RFC1113)\n",
-        "   -a");
+	"   -a");
     FPS "\n");
-}
 
-static void luM(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "M"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Modify trust attributes of certificate\n",
-        "-M");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-M");
     FPS "%-20s The nickname of the cert to modify\n",
-        "   -n cert-name");
+	"   -n cert-name");
     FPS "%-20s Set the certificate trust attributes (see -A above)\n",
-        "   -t trustargs");
+	"   -t trustargs");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "\n");
-}
-
-static void luN(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "N"));
-    if (ul == usage_all || !command || is_my_command)
-    FPS "%-15s Create a new certificate database\n",
-        "-N");
-    if (ul == usage_selected && !is_my_command)
-        return;
-    FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
-    FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
-    FPS "\n");
-}
 
-static void luT(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "T"));
-    if (ul == usage_all || !command || is_my_command)
-    FPS "%-15s Reset the Key database or token\n",
-        "-T");
-    if (ul == usage_selected && !is_my_command)
-        return;
+    FPS "%-15s Create a new certificate database\n",
+	"-N");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
-    FPS "%-20s Token to reset (default is internal)\n",
-        "   -h token-name");
-    FPS "%-20s Set token's Site Security Officer password\n",
-        "   -0 SSO-password");
+	"   -P dbprefix");
     FPS "\n");
-}
+    FPS "%-15s Reset the Key database or token\n",
+	"-T");
+    FPS "%-20s Cert database directory (default is ~/.netscape)\n",
+	"   -d certdir");
+    FPS "%-20s Cert & Key database prefix\n",
+	"   -P dbprefix");
+    FPS "%-20s Token to reset (default is internal)\n",
+	"   -h token-name");
+    FPS "%-20s Set token's Site Security Officer password\n",
+	"   -0 SSO-password");
+    FPS "\n");
 
-static void luO(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "O"));
-    if (ul == usage_all || !command || is_my_command)
+    FPS "\n");
     FPS "%-15s Print the chain of a certificate\n",
-        "-O");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-O");
     FPS "%-20s The nickname of the cert to modify\n",
-        "   -n cert-name");
+	"   -n cert-name");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Input the certificate in ASCII (RFC1113); default is binary\n",
-        "   -a");
+	"   -a");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-        "   -X");
+	"   -X");
     FPS "\n");
-}
 
-static void luR(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "R"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Generate a certificate request (stdout)\n",
-        "-R");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-R");
     FPS "%-20s Specify the subject name (using RFC1485)\n",
-        "   -s subject");
+	"   -s subject");
     FPS "%-20s Output the cert request to this file\n",
-        "   -o output-req");
+	"   -o output-req");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
 #endif /* NSS_ENABLE_ECC */
-        "   -k key-type-or-id");
+	"   -k key-type-or-id");
     FPS "%-20s or nickname of the cert key to use \n",
-        "");
+	"");
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-        "   -h token-name");
+	"   -h token-name");
     FPS "%-20s Key size in bits, RSA keys only (min %d, max %d, default %d)\n",
-        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
     FPS "%-20s Name of file containing PQG parameters (dsa only)\n",
-        "   -q pqgfile");
+	"   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-        "   -q curve-name");
+	"   -q curve-name");
     FPS "%-20s See the \"-G\" option for a full list of supported names.\n",
-        "");
+	"");
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Specify the password file\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-        "   -d keydir");
+	"   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s Specify the contact phone number (\"123-456-7890\")\n",
-        "   -p phone");
+	"   -p phone");
     FPS "%-20s Output the cert request in ASCII (RFC1113); default is binary\n",
-        "   -a");
+	"   -a");
     FPS "%-20s \n",
-        "   See -S for available extension options");
+	"   See -S for available extension options");
     FPS "\n");
-}
 
-static void luV(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "V"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Validate a certificate\n",
-        "-V");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-V");
     FPS "%-20s The nickname of the cert to Validate\n",
-        "   -n cert-name");
+	"   -n cert-name");
     FPS "%-20s validity time (\"YYMMDDHHMMSS[+HHMM|-HHMM|Z]\")\n",
-        "   -b time");
+	"   -b time");
     FPS "%-20s Check certificate signature \n",
-        "   -e ");   
+	"   -e ");   
     FPS "%-20s Specify certificate usage:\n", "   -u certusage");
     FPS "%-25s C \t SSL Client\n", "");
     FPS "%-25s V \t SSL Server\n", "");
     FPS "%-25s S \t Email signer\n", "");
     FPS "%-25s R \t Email Recipient\n", "");   
     FPS "%-25s O \t OCSP status responder\n", "");   
     FPS "%-25s J \t Object signer\n", "");   
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Input the certificate in ASCII (RFC1113); default is binary\n",
-        "   -a");
+	"   -a");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-        "   -X");
+	"   -X");
     FPS "\n");
-}
 
-static void luW(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "W"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Change the key database password\n",
-        "-W");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-W");
     FPS "%-20s cert and key database directory\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Specify a file with the current password\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s Specify a file with the new password in two lines\n",
-        "   -@ newpwfile");
-    FPS "\n");
-}
+	"   -@ newpwfile");
 
-static void luUpgradeMerge(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "upgrade-merge"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Upgrade an old database and merge it into a new one\n",
-        "--upgrade-merge");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"--upgrade-merge");
     FPS "%-20s Cert database directory to merge into (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix of the target database\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s Specify the password file for the target database\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s \n%-20s Cert database directory to upgrade from\n",
-        "   --source-dir certdir", "");
+	"   --source-dir certdir", "");
     FPS "%-20s \n%-20s Cert & Key database prefix of the upgrade database\n",
-        "   --soruce-prefix dbprefix", "");
+	"   --soruce-prefix dbprefix", "");
     FPS "%-20s \n%-20s Unique identifier for the upgrade database\n",
-        "   --upgrade-id uniqueID", "");
+	"   --upgrade-id uniqueID", "");
     FPS "%-20s \n%-20s Name of the token while it is in upgrade state\n",
-        "   --upgrade-token-name name", "");
+	"   --upgrade-token-name name", "");
     FPS "%-20s Specify the password file for the upgrade database\n",
-        "   -@ pwfile");
+	"   -@ pwfile");
     FPS "\n");
-}
 
-static void luMerge(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "merge"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Merge source database into the target database\n",
-        "--merge");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"--merge");
     FPS "%-20s Cert database directory of target (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix of the target database\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s Specify the password file for the target database\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s \n%-20s Cert database directory of the source database\n",
-        "   --source-dir certdir", "");
+	"   --source-dir certdir", "");
     FPS "%-20s \n%-20s Cert & Key database prefix of the source database\n",
-        "   --source-prefix dbprefix", "");
+	"   --source-prefix dbprefix", "");
     FPS "%-20s Specify the password file for the source database\n",
-        "   -@ pwfile");
+	"   -@ pwfile");
     FPS "\n");
-}
 
-static void luS(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "S"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Make a certificate and add to database\n",
         "-S");
-    if (ul == usage_selected && !is_my_command)
-        return;
     FPS "%-20s Specify the nickname of the cert\n",
         "   -n key-name");
     FPS "%-20s Specify the subject name (using RFC1485)\n",
         "   -s subject");
     FPS "%-20s The nickname of the issuer cert\n",
-        "   -c issuer-name");
+	"   -c issuer-name");
     FPS "%-20s Set the certificate trust attributes (see -A above)\n",
-        "   -t trustargs");
+	"   -t trustargs");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
 #endif /* NSS_ENABLE_ECC */
-        "   -k key-type-or-id");
+	"   -k key-type-or-id");
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-        "   -h token-name");
+	"   -h token-name");
     FPS "%-20s Key size in bits, RSA keys only (min %d, max %d, default %d)\n",
-        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
     FPS "%-20s Name of file containing PQG parameters (dsa only)\n",
-        "   -q pqgfile");
+	"   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-        "   -q curve-name");
+	"   -q curve-name");
     FPS "%-20s See the \"-G\" option for a full list of supported names.\n",
-        "");
+	"");
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Self sign\n",
-        "   -x");
+	"   -x");
     FPS "%-20s Cert serial number\n",
-        "   -m serial-number");
+	"   -m serial-number");
     FPS "%-20s Time Warp\n",
-        "   -w warp-months");
+	"   -w warp-months");
     FPS "%-20s Months valid (default is 3)\n",
         "   -v months-valid");
     FPS "%-20s Specify the password file\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s Specify the contact phone number (\"123-456-7890\")\n",
-        "   -p phone");
+	"   -p phone");
     FPS "%-20s Create key usage extension\n",
-        "   -1 ");
+	"   -1 ");
     FPS "%-20s Create basic constraint extension\n",
-        "   -2 ");
+	"   -2 ");
     FPS "%-20s Create authority key ID extension\n",
-        "   -3 ");
+	"   -3 ");
     FPS "%-20s Create crl distribution point extension\n",
-        "   -4 ");
+	"   -4 ");
     FPS "%-20s Create netscape cert type extension\n",
-        "   -5 ");
+	"   -5 ");
     FPS "%-20s Create extended key usage extension\n",
-        "   -6 ");
+	"   -6 ");
     FPS "%-20s Create an email subject alt name extension\n",
-        "   -7 emailAddrs ");
+	"   -7 emailAddrs ");
     FPS "%-20s Create a DNS subject alt name extension\n",
-        "   -8 DNS-names");
+	"   -8 DNS-names");
     FPS "%-20s Create an Authority Information Access extension\n",
-        "   --extAIA ");
+	"   --extAIA ");
     FPS "%-20s Create a Subject Information Access extension\n",
-        "   --extSIA ");
+	"   --extSIA ");
     FPS "%-20s Create a Certificate Policies extension\n",
-        "   --extCP ");
+	"   --extCP ");
     FPS "%-20s Create a Policy Mappings extension\n",
-        "   --extPM ");
+	"   --extPM ");
     FPS "%-20s Create a Policy Constraints extension\n",
-        "   --extPC ");
+	"   --extPC ");
     FPS "%-20s Create an Inhibit Any Policy extension\n",
-        "   --extIA ");
+	"   --extIA ");
     FPS "%-20s Create a subject key ID extension\n",
-        "   --extSKID ");
+	"   --extSKID ");
     FPS "\n");
-}
 
-static void LongUsage(char *progName, enum usage_level ul, const char *command)
-{
-    luA(ul, command);
-    luB(ul, command);
-    luE(ul, command);
-    luC(ul, command);
-    luG(ul, command);
-    luD(ul, command);
-    luU(ul, command);
-    luK(ul, command);
-    luL(ul, command);
-    luM(ul, command);
-    luN(ul, command);
-    luT(ul, command);
-    luO(ul, command);
-    luR(ul, command);
-    luV(ul, command);
-    luW(ul, command);
-    luUpgradeMerge(ul, command);
-    luMerge(ul, command);
-    luS(ul, command);
+    exit(1);
 #undef FPS
 }
 
-static void
-Usage(char *progName)
-{
-    PR_fprintf(PR_STDERR,
-        "%s - Utility to manipulate NSS certificate databases\n\n"
-        "Usage:  %s <command> -d <database-directory> <options>\n\n"
-        "Valid commands:\n", progName, progName);
-    LongUsage(progName, usage_selected, NULL);
-    PR_fprintf(PR_STDERR, "\n"
-        "%s -H <command> : Print available options for the given command\n"
-        "%s -H : Print complete help output of all commands and options\n"
-        "%s --syntax : Print a short summary of all commands and options\n",
-        progName, progName, progName);
-    exit(1);
-}
 
 static CERTCertificate *
 MakeV1Cert(	CERTCertDBHandle *	handle, 
 		CERTCertificateRequest *req,
 	    	char *			issuerNickName, 
 		PRBool 			selfsign, 
 		unsigned int 		serialNumber,
 		int 			warpmonths,
@@ -2010,33 +1824,31 @@ DumpMergeLog(const char *progname, PK11M
 enum {
     cmd_AddCert = 0,
     cmd_CreateNewCert,
     cmd_DeleteCert,
     cmd_AddEmailCert,
     cmd_DeleteKey,
     cmd_GenKeyPair,
     cmd_PrintHelp,
-    cmd_PrintSyntax,
     cmd_ListKeys,
     cmd_ListCerts,
     cmd_ModifyCertTrust,
     cmd_NewDBs,
     cmd_DumpChain,
     cmd_CertReq,
     cmd_CreateAndAddCert,
     cmd_TokenReset,
     cmd_ListModules,
     cmd_CheckCertValidity,
     cmd_ChangePassword,
     cmd_Version,
     cmd_Batch,
     cmd_Merge,
-    cmd_UpgradeMerge, /* test only */
-    max_cmd
+    cmd_UpgradeMerge /* test only */
 };
 
 /*  Certutil options */
 enum certutilOpts {
     opt_SSOPass = 0,
     opt_AddKeyUsageExt,
     opt_AddBasicConstraintExt,
     opt_AddAuthorityKeyIDExt,
@@ -2084,32 +1896,29 @@ enum certutilOpts {
     opt_AddInhibAnyExt,
     opt_AddSubjectKeyIDExt,
     opt_AddCmdKeyUsageExt,
     opt_AddCmdNSCertTypeExt,
     opt_AddCmdExtKeyUsageExt,
     opt_SourceDir,
     opt_SourcePrefix,
     opt_UpgradeID,
-    opt_UpgradeTokenName,
-    opt_Help
+    opt_UpgradeTokenName
 };
 
 static const
 secuCommandFlag commands_init[] =
 {
 	{ /* cmd_AddCert             */  'A', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_CreateNewCert       */  'C', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_DeleteCert          */  'D', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_AddEmailCert        */  'E', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_DeleteKey           */  'F', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_GenKeyPair          */  'G', PR_FALSE, 0, PR_FALSE },
-	{ /* cmd_PrintHelp           */  'H', PR_FALSE, 0, PR_FALSE, "help" },
-        { /* cmd_PrintSyntax         */   0,  PR_FALSE, 0, PR_FALSE,
-                                                   "syntax" },
+	{ /* cmd_PrintHelp           */  'H', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_ListKeys            */  'K', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_ListCerts           */  'L', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_ModifyCertTrust     */  'M', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_NewDBs              */  'N', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_DumpChain           */  'O', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_CertReq             */  'R', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_CreateAndAddCert    */  'S', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_TokenReset          */  'T', PR_FALSE, 0, PR_FALSE },
@@ -2249,42 +2058,18 @@ certutil_main(int argc, char **argv, PRB
     memcpy(certutil_commands, commands_init, sizeof commands_init);
     memcpy(certutil_options,  options_init,  sizeof options_init);
 
     rv = SECU_ParseCommandLine(argc, argv, progName, &certutil);
 
     if (rv != SECSuccess)
 	Usage(progName);
 
-    if (certutil.commands[cmd_PrintSyntax].activated) {
-        PrintSyntax(progName);
-    }
-
-    if (certutil.commands[cmd_PrintHelp].activated) {
-        int i;
-        char buf[2];
-        const char *command = NULL;
-        for (i = 0; i < max_cmd; i++) {
-            if (i == cmd_PrintHelp)
-                continue;
-            if (certutil.commands[i].activated) {
-                if (certutil.commands[i].flag) {
-                    buf[0] = certutil.commands[i].flag;
-                    buf[1] = 0;
-                    command = buf;
-                }
-                else {
-                    command = certutil.commands[i].longform;
-                }
-                break;
-            }
-        }
-	LongUsage(progName, (command ? usage_selected : usage_all), command);
-        exit(1);
-    }
+    if (certutil.commands[cmd_PrintHelp].activated)
+	LongUsage(progName);
 
     if (certutil.options[opt_PasswordFile].arg) {
 	pwdata.source = PW_FROMFILE;
 	pwdata.data = certutil.options[opt_PasswordFile].arg;
     }
     if (certutil.options[opt_NewPasswordFile].arg) {
 	pwdata2.source = PW_FROMFILE;
 	pwdata2.data = certutil.options[opt_NewPasswordFile].arg;
@@ -2457,16 +2242,17 @@ certutil_main(int argc, char **argv, PRB
 	for (i=0; i< certutil.numCommands; i++) {
 	    if (certutil.commands[i].activated)
 		PR_fprintf(PR_STDERR, " -%c", certutil.commands[i].flag);
 	}
 	PR_fprintf(PR_STDERR, "\n");
 	return 255;
     }
     if (commandsEntered == 0) {
+	PR_fprintf(PR_STDERR, "%s: you must enter a command!\n", progName);
 	Usage(progName);
     }
 
     if (certutil.commands[cmd_ListCerts].activated ||
          certutil.commands[cmd_PrintHelp].activated ||
          certutil.commands[cmd_ListKeys].activated ||
          certutil.commands[cmd_ListModules].activated ||
          certutil.commands[cmd_CheckCertValidity].activated ||
--- a/security/nss/cmd/lib/secutil.c
+++ b/security/nss/cmd/lib/secutil.c
@@ -976,17 +976,17 @@ SECU_PrintInteger(FILE *out, SECItem *i,
 	    fprintf(out, "%s: %d (0x%x)\n", m, iv, iv);
 	} else {
 	    fprintf(out, "%d (0x%x)\n", iv, iv);
 	}
     }
 }
 
 static void
-secu_PrintRawString(FILE *out, SECItem *si, const char *m, int level)
+secu_PrintRawString(FILE *out, SECItem *si, char *m, int level)
 {
     int column;
     unsigned int i;
 
     if ( m ) {
 	SECU_Indent(out, level); fprintf(out, "%s: ", m);
 	column = (level * INDENT_MULT) + strlen(m) + 2;
 	level++;
@@ -2089,35 +2089,33 @@ secu_PrintCRLDistPtsExtension(FILE *out,
 	SECU_PrintError("Error", "Allocating new ArenaPool");
 	return;
     }
     dPoints = CERT_DecodeCRLDistributionPoints(pool, value);
     if (dPoints && dPoints->distPoints && dPoints->distPoints[0]) {
 	CRLDistributionPoint ** pPoints = dPoints->distPoints;
 	CRLDistributionPoint *  pPoint;
 	while (NULL != (pPoint = *pPoints++)) {
-	    SECU_Indent(out, level); fputs("Distribution point:\n", out);
 	    if (pPoint->distPointType == generalName && 
 	        pPoint->distPoint.fullName != NULL) {
 		secu_PrintGeneralNames(out, pPoint->distPoint.fullName, NULL,
-		                       level + 1);
+		                       level);
 	    } else if (pPoint->distPointType == relativeDistinguishedName &&
 	               pPoint->distPoint.relativeName.avas) {
 		SECU_PrintRDN(out, &pPoint->distPoint.relativeName, "RDN", 
-		              level + 1);
+		              level);
 	    } else if (pPoint->derDistPoint.data) {
-		SECU_PrintAny(out, &pPoint->derDistPoint, "Point", level + 1);
+		SECU_PrintAny(out, &pPoint->derDistPoint, "Point", level);
 	    }
 	    if (pPoint->reasons.data) {
 		secu_PrintDecodedBitString(out, &pPoint->reasons, "Reasons", 
-		                           level + 1);
+		                           level);
 	    }
 	    if (pPoint->crlIssuer) {
-		secu_PrintGeneralName(out, pPoint->crlIssuer, "CRL issuer",
-				      level + 1);
+		secu_PrintGeneralName(out, pPoint->crlIssuer, "Issuer", level);
 	    }
 	}
     } else {
 	SECU_PrintErrMsg(out, level, "Error", "Parsing extension");
 	SECU_PrintAny(out, value, "Data", level);
     }
     PORT_FreeArena(pool, PR_FALSE);
 }
@@ -2329,30 +2327,30 @@ SECU_PrintExtensions(FILE *out, CERTCert
 	}
     }
 }
 
 /* An RDN is a subset of a DirectoryName, and we already know how to
  * print those, so make a directory name out of the RDN, and print it.
  */
 void
-SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level)
+SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level)
 {
     CERTName name;
     CERTRDN *rdns[2];
 
     name.arena = NULL;
     name.rdns  = rdns;
     rdns[0] = rdn;
     rdns[1] = NULL;
     SECU_PrintName(out, &name, msg, level);
 }
 
 void
-SECU_PrintName(FILE *out, CERTName *name, const char *msg, int level)
+SECU_PrintName(FILE *out, CERTName *name, char *msg, int level)
 {
     char *nameStr = NULL;
     char *str;
     SECItem my;
 
     if (!name) {
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	return;
--- a/security/nss/cmd/lib/secutil.h
+++ b/security/nss/cmd/lib/secutil.h
@@ -304,19 +304,18 @@ extern void SECU_PrintAny(FILE *out, SEC
 
 extern void SECU_PrintPolicy(FILE *out, SECItem *value, char *msg, int level);
 extern void SECU_PrintPrivKeyUsagePeriodExtension(FILE *out, SECItem *value,
                                  char *msg, int level);
 
 extern void SECU_PrintExtensions(FILE *out, CERTCertExtension **extensions,
 				 char *msg, int level);
 
-extern void SECU_PrintName(FILE *out, CERTName *name, const char *msg,
-                           int level);
-extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level);
+extern void SECU_PrintName(FILE *out, CERTName *name, char *msg, int level);
+extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level);
 
 #ifdef SECU_GetPassword
 /* Convert a High public Key to a Low public Key */
 extern SECKEYLowPublicKey *SECU_ConvHighToLow(SECKEYPublicKey *pubHighKey);
 #endif
 
 extern char *SECU_GetModulePassword(PK11SlotInfo *slot, PRBool retry, void *arg);
 
--- a/security/nss/cmd/selfserv/selfserv.c
+++ b/security/nss/cmd/selfserv/selfserv.c
@@ -1486,28 +1486,24 @@ do_accepts(
 PRFileDesc *
 getBoundListenSocket(unsigned short port)
 {
     PRFileDesc *       listen_sock;
     int                listenQueueDepth = 5 + (2 * maxThreads);
     PRStatus	       prStatus;
     PRNetAddr          addr;
     PRSocketOptionData opt;
-    PRUint16           socketDomain = PR_AF_INET;
 
     addr.inet.family = PR_AF_INET;
     addr.inet.ip     = PR_INADDR_ANY;
     addr.inet.port   = PR_htons(port);
 
-    if (PR_GetEnv("NSS_USE_SDP")) {
-        socketDomain = PR_AF_INET_SDP;
-    }
-    listen_sock = PR_OpenTCPSocket(socketDomain);
+    listen_sock = PR_NewTCPSocket();
     if (listen_sock == NULL) {
-        errExit("PR_OpenTCPSocket error");
+	errExit("PR_NewTCPSocket");
     }
 
     opt.option = PR_SockOpt_Nonblocking;
     opt.value.non_blocking = PR_FALSE;
     prStatus = PR_SetSocketOption(listen_sock, &opt);
     if (prStatus < 0) {
         PR_Close(listen_sock);
 	errExit("PR_SetSocketOption(PR_SockOpt_Nonblocking)");
--- a/security/nss/cmd/shlibsign/shlibsign.c
+++ b/security/nss/cmd/shlibsign/shlibsign.c
@@ -41,17 +41,17 @@
  *
  * The generated .chk files must be put in the same directory as
  * the NSS libraries they were generated for.
  *
  * When in FIPS 140 mode, the NSS Internal FIPS PKCS #11 Module will
  * compute the checksum for the NSS cryptographic boundary libraries
  * and compare the checksum with the value in .chk file.
  *
- * $Id: shlibsign.c,v 1.18.20.1 2011/04/08 04:04:27 wtc%google.com Exp $
+ * $Id: shlibsign.c,v 1.18 2008/11/20 15:44:12 glen.beasley%sun.com Exp $
  */
 
 #ifdef XP_UNIX
 #define USES_LINKS 1
 #endif
 
 #include <assert.h>
 #include <stdio.h>
@@ -1007,17 +1007,17 @@ int main(int argc, char **argv)
             for (j=0; j < STEP && (i+j) < (int) signLen; j++) {
                 PR_fprintf(PR_STDERR," %02x", sign[i+j]);
             }
             PR_fprintf(PR_STDERR,"\n");
         }
     }
 
     /* open the target signature file */
-    fd = PR_Open(output_file,PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE,0666);
+    fd = PR_OpenFile(output_file,PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE,0666);
     if (fd == NULL ) {
         lperror(output_file);
         goto cleanup;
     }
 
     /*
      * we write the key out in a straight binary format because very
      * low level libraries need to read an parse this file. Ideally we should
--- a/security/nss/cmd/strsclnt/strsclnt.c
+++ b/security/nss/cmd/strsclnt/strsclnt.c
@@ -355,31 +355,30 @@ printSecurityInfo(PRFileDesc *fd)
 }
 
 /**************************************************************************
 ** Begin thread management routines and data.
 **************************************************************************/
 
 #define MAX_THREADS 128
 
-typedef int startFn(void *a, void *b, int c, int d);
+typedef int startFn(void *a, void *b, int c);
 
 
 static PRInt32     numConnected;
 static int         max_threads;    /* peak threads allowed */
 
 typedef struct perThreadStr {
     void *	a;
     void *	b;
     int         tid;
     int         rv;
     startFn  *  startFunc;
     PRThread *  prThread;
     PRBool	inUse;
-    PRInt32     socketDomain;
 } perThread;
 
 perThread threads[MAX_THREADS];
 
 void
 thread_wrapper(void * arg)
 {
     perThread * slot = (perThread *)arg;
@@ -425,34 +424,32 @@ thread_wrapper(void * arg)
             if (--remaining_connections >= 0) { /* protected by threadLock */
                 doop = PR_TRUE;
             } else {
                 done = PR_TRUE;
             }
         }
         PR_Unlock(threadLock);
         if (doop) {
-            slot->rv = (* slot->startFunc)(slot->a, slot->b, slot->tid,
-                                           slot->socketDomain);
+            slot->rv = (* slot->startFunc)(slot->a, slot->b, slot->tid);
             PRINTF("strsclnt: Thread in slot %d returned %d\n", 
                    slot->tid, slot->rv);
         }
         if (dosleep) {
             PR_Sleep(PR_SecondsToInterval(1));
         }
     } while (!done && (!failed_already || ignoreErrors));
 }
 
 SECStatus
 launch_thread(
     startFn *	startFunc,
     void *	a,
     void *	b,
-    int         tid,
-    int         sockDom)
+    int         tid)
 {
     PRUint32 i;
     perThread * slot;
 
     PR_Lock(threadLock);
 
     PORT_Assert(numUsed < MAX_THREADS);
     if (! (numUsed < MAX_THREADS)) {
@@ -460,18 +457,17 @@ launch_thread(
         return SECFailure;
     }
 
     i = numUsed++;
     slot = &threads[i];
     slot->a = a;
     slot->b = b;
     slot->tid = tid;
-    slot->socketDomain = sockDom;
-    
+
     slot->startFunc = startFunc;
 
     slot->prThread      = PR_CreateThread(PR_USER_THREAD,
                                       thread_wrapper, slot,
 				      PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
 				      PR_JOINABLE_THREAD, 0);
     if (slot->prThread == NULL) {
 	PR_Unlock(threadLock);
@@ -584,18 +580,17 @@ lockedVars_AddToCount(lockedVars * lv, i
     PR_Unlock(lv->lock);
     return rv;
 }
 
 int
 do_writes(
     void *       a,
     void *       b,
-    int          c,
-    int          d)
+    int          c)
 {
     PRFileDesc *	ssl_sock	= (PRFileDesc *)a;
     lockedVars *	lv 		= (lockedVars *)b;
     int			sent  		= 0;
     int 		count		= 0;
 
     while (sent < bigBuf.len) {
 
@@ -627,17 +622,17 @@ handle_fdx_connection( PRFileDesc * ssl_
     lockedVars         lv;
     char               *buf;
 
 
     lockedVars_Init(&lv);
     lockedVars_AddToCount(&lv, 1);
 
     /* Attempt to launch the writer thread. */
-    result = launch_thread(do_writes, ssl_sock, &lv, connection, -1 /*not used*/);
+    result = launch_thread(do_writes, ssl_sock, &lv, connection);
 
     if (result != SECSuccess) 
     	goto cleanup;
 
     buf = PR_Malloc(RD_BUF_SIZE);
 
     if (buf) {
 	do {
@@ -746,32 +741,31 @@ myHandshakeCallback(PRFileDesc *socket, 
 
 /* one copy of this function is launched in a separate thread for each
 ** connection to be made.
 */
 int
 do_connects(
     void *	a,
     void *	b,
-    int         tid,
-    PRInt32     socketDomain)
+    int         tid)
 {
     PRNetAddr  *        addr		= (PRNetAddr *)  a;
     PRFileDesc *        model_sock	= (PRFileDesc *) b;
     PRFileDesc *        ssl_sock	= 0;
     PRFileDesc *        tcp_sock	= 0;
     PRStatus	        prStatus;
     PRUint32            sleepInterval	= 50; /* milliseconds */
     SECStatus   	result;
     int                 rv 		= SECSuccess;
     PRSocketOptionData  opt;
 
 retry:
 
-    tcp_sock = PR_OpenTCPSocket(socketDomain);
+    tcp_sock = PR_OpenTCPSocket(addr->raw.family);
     if (tcp_sock == NULL) {
 	errExit("PR_OpenTCPSocket");
     }
 
     opt.option             = PR_SockOpt_Nonblocking;
     opt.value.non_blocking = PR_FALSE;
     prStatus = PR_SetSocketOption(tcp_sock, &opt);
     if (prStatus != PR_SUCCESS) {
@@ -1089,17 +1083,16 @@ client_main(
     const char *	hostName,
     const char *	sniHostName)
 {
     PRFileDesc *model_sock	= NULL;
     int         i;
     int         rv;
     PRStatus    status;
     PRNetAddr   addr;
-    PRInt32    socketDomain;
 
     status = PR_StringToNetAddr(hostName, &addr);
     if (status == PR_SUCCESS) {
     	addr.inet.port = PR_htons(port);
     } else {
 	/* Lookup host */
 	PRAddrInfo *addrInfo;
 	void       *enumPtr   = NULL;
@@ -1117,23 +1110,16 @@ client_main(
 		 addr.raw.family != PR_AF_INET6);
 	PR_FreeAddrInfo(addrInfo);
 	if (enumPtr == NULL) {
 	    SECU_PrintError(progName, "error looking up host address");
 	    return;
 	}
     }
 
-    /* check if SDP is going to be used */
-    if (!PR_GetEnv("NSS_USE_SDP")) {
-        socketDomain = addr.raw.family;
-    } else {
-        socketDomain = PR_AF_INET_SDP;
-    }
-
     /* all suites except RSA_NULL_MD5 are enabled by Domestic Policy */
     NSS_SetDomesticPolicy();
 
     /* all the SSL2 and SSL3 cipher suites are enabled by default. */
     if (cipherString) {
         int ndx;
 
         /* disable all the ciphers, then enable the ones we want. */
@@ -1180,18 +1166,18 @@ client_main(
 			cipher);
 		failed_already = 1;
 		return;
 	    }
         }
     }
 
     /* configure model SSL socket. */
-    
-    model_sock = PR_OpenTCPSocket(socketDomain);
+
+    model_sock = PR_OpenTCPSocket(addr.raw.family);
     if (model_sock == NULL) {
 	errExit("PR_OpenTCPSocket for model socket");
     }
 
     model_sock = SSL_ImportFD(NULL, model_sock);
     if (model_sock == NULL) {
 	errExit("SSL_ImportFD");
     }
@@ -1285,26 +1271,26 @@ client_main(
 
     remaining_connections = total_connections = connections;
     total_connections_modulo_100 = total_connections % 100;
     total_connections_rounded_down_to_hundreds =
         total_connections - total_connections_modulo_100;
 
     if (!NoReuse) {
         remaining_connections = 1;
-	rv = launch_thread(do_connects, &addr, model_sock, 0, socketDomain);
+	rv = launch_thread(do_connects, &addr, model_sock, 0);
 	/* wait for the first connection to terminate, then launch the rest. */
 	reap_threads();
         remaining_connections = total_connections - 1 ;
     }
     if (remaining_connections > 0) {
         active_threads  = PR_MIN(active_threads, remaining_connections);
 	/* Start up the threads */
 	for (i=0;i<active_threads;i++) {
-	    rv = launch_thread(do_connects, &addr, model_sock, i, socketDomain);
+	    rv = launch_thread(do_connects, &addr, model_sock, i);
 	}
 	reap_threads();
     }
     destroy_thread_data();
 
     PR_Close(model_sock);
 }
 
--- a/security/nss/cmd/tstclnt/tstclnt.c
+++ b/security/nss/cmd/tstclnt/tstclnt.c
@@ -533,17 +533,16 @@ int main(int argc, char **argv)
     int                headerSeparatorPtrnId = 0;
     int                error = 0;
     PRUint16           portno = 443;
     char *             hs1SniHostName = NULL;
     char *             hs2SniHostName = NULL;
     PLOptState *optstate;
     PLOptStatus optstatus;
     PRStatus prStatus;
-    PRUint16           socketDomain;
 
     progName = strrchr(argv[0], '/');
     if (!progName)
 	progName = strrchr(argv[0], '\\');
     progName = progName ? progName+1 : argv[0];
 
     tmp = PR_GetEnv("NSS_DEBUG_TIMEOUT");
     if (tmp && tmp[0]) {
@@ -695,27 +694,21 @@ int main(int argc, char **argv)
 	if (enumPtr == NULL) {
 	    SECU_PrintError(progName, "error looking up host address");
 	    return 1;
 	}
     }
 
     printHostNameAndAddr(host, &addr);
 
-    /* check if SDP is going to be used */
-    if (!PR_GetEnv("NSS_USE_SDP")) {
-        socketDomain = addr.raw.family;
-    } else {
-        socketDomain = PR_AF_INET_SDP;
-    }
     if (pingServerFirst) {
 	int iter = 0;
 	PRErrorCode err;
 	do {
-	    s = PR_OpenTCPSocket(socketDomain);
+	    s = PR_OpenTCPSocket(addr.raw.family);
 	    if (s == NULL) {
 		SECU_PrintError(progName, "Failed to create a TCP socket");
 	    }
 	    opt.option             = PR_SockOpt_Nonblocking;
 	    opt.value.non_blocking = PR_FALSE;
 	    prStatus = PR_SetSocketOption(s, &opt);
 	    if (prStatus != PR_SUCCESS) {
 		PR_Close(s);
@@ -743,17 +736,17 @@ int main(int argc, char **argv)
 	    PR_Sleep(PR_MillisecondsToInterval(WAIT_INTERVAL));
 	} while (++iter < MAX_WAIT_FOR_SERVER);
 	SECU_PrintError(progName, 
                      "Client timed out while waiting for connection to server");
 	return 1;
     }
 
     /* Create socket */
-    s = PR_OpenTCPSocket(socketDomain);
+    s = PR_OpenTCPSocket(addr.raw.family);
     if (s == NULL) {
 	SECU_PrintError(progName, "error creating socket");
 	return 1;
     }
 
     opt.option = PR_SockOpt_Nonblocking;
     opt.value.non_blocking = PR_TRUE;
     PR_SetSocketOption(s, &opt);
--- a/security/nss/lib/certdb/cert.h
+++ b/security/nss/lib/certdb/cert.h
@@ -32,17 +32,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 /*
  * cert.h - public data structures and prototypes for the certificate library
  *
- * $Id: cert.h,v 1.80.2.3 2011/04/08 22:54:34 kaie%kuix.de Exp $
+ * $Id: cert.h,v 1.80.2.1 2010/09/24 13:31:57 kaie%kuix.de Exp $
  */
 
 #ifndef _CERT_H_
 #define _CERT_H_
 
 #include "utilrename.h"
 #include "plarena.h"
 #include "plhash.h"
@@ -1107,17 +1107,17 @@ extern CERTDistNames *CERT_DistNamesFrom
 extern CERTCertificateList *
 CERT_CertChainFromCert(CERTCertificate *cert, SECCertUsage usage,
 		       PRBool includeRoot);
 
 extern CERTCertificateList *
 CERT_CertListFromCert(CERTCertificate *cert);
 
 extern CERTCertificateList *
-CERT_DupCertList(const CERTCertificateList * oldList);
+CERT_DupCertList(CERTCertificateList * oldList);
 
 extern void CERT_DestroyCertificateList(CERTCertificateList *list);
 
 /*
 ** is cert a user cert? i.e. does it have CERTDB_USER trust,
 ** i.e. a private key?
 */
 PRBool CERT_IsUserCert(CERTCertificate* cert);
@@ -1660,39 +1660,32 @@ CERT_GetClassicOCSPDisabledPolicy(void);
  *   the caller may pass NULL, in which case no parameters are returned.
  */
 extern SECStatus CERT_PKIXVerifyCert(
 	CERTCertificate *cert,
 	SECCertificateUsage usages,
 	CERTValInParam *paramsIn,
 	CERTValOutParam *paramsOut,
 	void *wincx);
+/*
+ * This function changes the application defaults for the Verify function.
+ * It should be called once at app initialization time, and only changes
+ * if the default configuration changes.
+ *
+ * This changes the default values for the parameters specified. These
+ * defaults can be overridden in CERT_PKIXVerifyCert() by explicitly 
+ * setting the value in paramsIn.
+ */
+extern SECStatus CERT_PKIXSetDefaults(CERTValInParam *paramsIn);
 
 /* Makes old cert validation APIs(CERT_VerifyCert, CERT_VerifyCertificate)
  * to use libpkix validation engine. The function should be called ones at
  * application initialization time.
  * Function is not thread safe.*/
-extern SECStatus CERT_SetUsePKIXForValidation(PRBool enable);
+SECStatus CERT_SetUsePKIXForValidation(PRBool enable);
 
 /* The function return PR_TRUE if cert validation should use
  * libpkix cert validation engine. */
-extern PRBool CERT_GetUsePKIXForValidation(void);
-
-/*
- * Allocate a parameter container of type CERTRevocationFlags,
- * and allocate the inner arrays of the given sizes.
- * To cleanup call CERT_DestroyCERTRevocationFlags.
- */
-extern CERTRevocationFlags *
-CERT_AllocCERTRevocationFlags(
-    PRUint32 number_leaf_methods, PRUint32 number_leaf_pref_methods,
-    PRUint32 number_chain_methods, PRUint32 number_chain_pref_methods);
-
-/*
- * Destroy the arrays inside flags,
- * and destroy the object pointed to by flags, too.
- */
-extern void
-CERT_DestroyCERTRevocationFlags(CERTRevocationFlags *flags);
+PRBool CERT_GetUsePKIXForValidation(void);
 
 SEC_END_PROTOS
 
 #endif /* _CERT_H_ */
--- a/security/nss/lib/certdb/stanpcertdb.c
+++ b/security/nss/lib/certdb/stanpcertdb.c
@@ -32,17 +32,16 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "prtime.h"
 
 #include "cert.h"
-#include "certi.h"
 #include "certdb.h"
 #include "secitem.h"
 #include "secder.h"
 
 /* Call to PK11_FreeSlot below */
 
 #include "secasn1.h"
 #include "secerr.h"
@@ -82,36 +81,22 @@ SEC_CertNicknameConflict(const char *nic
 }
 
 SECStatus
 SEC_DeletePermCertificate(CERTCertificate *cert)
 {
     PRStatus nssrv;
     NSSTrustDomain *td = STAN_GetDefaultTrustDomain();
     NSSCertificate *c = STAN_GetNSSCertificate(cert);
-    CERTCertTrust *certTrust;
 
     if (c == NULL) {
         /* error code is set */
         return SECFailure;
     }
 
-    certTrust = nssTrust_GetCERTCertTrustForCert(c, cert);
-    if (certTrust) {
-	NSSTrust *nssTrust = nssTrustDomain_FindTrustForCertificate(td, c);
-	if (nssTrust) {
-	    nssrv = STAN_DeleteCertTrustMatchingSlot(c);
-	    if (nssrv != PR_SUCCESS) {
-    		CERT_MapStanError();
-    	    }
-	    /* This call always returns PR_SUCCESS! */
-	    (void) nssTrust_Destroy(nssTrust);
-	}
-    }
-
     /* get rid of the token instances */
     nssrv = NSSCertificate_DeleteStoredObject(c, NULL);
 
     /* get rid of the cache entry */
     nssTrustDomain_LockCertCache(td);
     nssTrustDomain_RemoveCertFromCacheLOCKED(td, c);
     nssTrustDomain_UnlockCertCache(td);
 
--- a/security/nss/lib/certhigh/certhigh.c
+++ b/security/nss/lib/certhigh/certhigh.c
@@ -1171,17 +1171,17 @@ no_memory:
 loser:
     if (arena != NULL) {
 	PORT_FreeArena(arena, PR_FALSE);
     }
     return NULL;
 }
 
 CERTCertificateList *
-CERT_DupCertList(const CERTCertificateList * oldList)
+CERT_DupCertList(CERTCertificateList * oldList)
 {
     CERTCertificateList *newList = NULL;
     PRArenaPool         *arena   = NULL;
     SECItem             *newItem;
     SECItem             *oldItem;
     int                 len      = oldList->len;
     int                 rv;
 
--- a/security/nss/lib/certhigh/certvfypkix.c
+++ b/security/nss/lib/certhigh/certvfypkix.c
@@ -1981,73 +1981,16 @@ static const CERTRevocationFlags certRev
 };
 
 extern const CERTRevocationFlags*
 CERT_GetPKIXVerifyNistRevocationPolicy()
 {
     return &certRev_PKIX_Verify_Nist_Policy;
 }
 
-CERTRevocationFlags *
-CERT_AllocCERTRevocationFlags(
-    PRUint32 number_leaf_methods, PRUint32 number_leaf_pref_methods,
-    PRUint32 number_chain_methods, PRUint32 number_chain_pref_methods)
-{
-    CERTRevocationFlags *flags;
-    
-    flags = PORT_New(CERTRevocationFlags);
-    if (!flags)
-        return(NULL);
-    
-    flags->leafTests.number_of_defined_methods = number_leaf_methods;
-    flags->leafTests.cert_rev_flags_per_method = 
-        PORT_NewArray(PRUint64, number_leaf_methods);
-
-    flags->leafTests.number_of_preferred_methods = number_leaf_pref_methods;
-    flags->leafTests.preferred_methods = 
-        PORT_NewArray(CERTRevocationMethodIndex, number_leaf_pref_methods);
-
-    flags->chainTests.number_of_defined_methods = number_chain_methods;
-    flags->chainTests.cert_rev_flags_per_method = 
-        PORT_NewArray(PRUint64, number_chain_methods);
-
-    flags->chainTests.number_of_preferred_methods = number_chain_pref_methods;
-    flags->chainTests.preferred_methods = 
-        PORT_NewArray(CERTRevocationMethodIndex, number_chain_pref_methods);
-    
-    if (!flags->leafTests.cert_rev_flags_per_method
-        || !flags->leafTests.preferred_methods
-        || !flags->chainTests.cert_rev_flags_per_method
-        || !flags->chainTests.preferred_methods) {
-        CERT_DestroyCERTRevocationFlags(flags);
-        return (NULL);
-    }
-    
-    return flags;
-}
-
-void CERT_DestroyCERTRevocationFlags(CERTRevocationFlags *flags)
-{
-    if (!flags)
-	return;
-  
-    if (flags->leafTests.cert_rev_flags_per_method)
-        PORT_Free(flags->leafTests.cert_rev_flags_per_method);
-
-    if (flags->leafTests.preferred_methods)
-        PORT_Free(flags->leafTests.preferred_methods);
-    
-    if (flags->chainTests.cert_rev_flags_per_method)
-        PORT_Free(flags->chainTests.cert_rev_flags_per_method);
-
-    if (flags->chainTests.preferred_methods)
-        PORT_Free(flags->chainTests.preferred_methods);
-
-     PORT_Free(flags);
-}
 
 /*
  * CERT_PKIXVerifyCert
  *
  * Verify a Certificate using the PKIX library.
  *
  * Parameters:
  *  cert    - the target certificate to verify. Must be non-null
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -30,34 +30,33 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $";
+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $";
 #endif /* DEBUG */
 
 #ifndef BUILTINS_H
 #include "builtins.h"
 #endif /* BUILTINS_H */
 
 static const CK_BBOOL ck_false = CK_FALSE;
 static const CK_BBOOL ck_true = CK_TRUE;
 static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509;
 static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
 static const CK_OBJECT_CLASS cko_data = CKO_DATA;
 static const CK_OBJECT_CLASS cko_netscape_builtin_root_list = CKO_NETSCAPE_BUILTIN_ROOT_LIST;
 static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
 static const CK_TRUST ckt_netscape_trust_unknown = CKT_NETSCAPE_TRUST_UNKNOWN;
 static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
 static const CK_TRUST ckt_netscape_untrusted = CKT_NETSCAPE_UNTRUSTED;
-static const CK_TRUST ckt_netscape_valid = CKT_NETSCAPE_VALID;
 #ifdef DEBUG
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_0 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_APPLICATION,  CKA_VALUE
 };
 #endif /* DEBUG */
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_1 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL
 };
@@ -986,55 +985,25 @@ static const CK_ATTRIBUTE_TYPE nss_built
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_310 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_311 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
 };
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_312 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_313 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_314 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_315 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_316 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_317 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_318 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_319 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_320 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-};
 #ifdef DEBUG
 static const NSSItem nss_builtins_items_0 [] = {
   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (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.9 $ $Date: 2011/04/06 23:59:08 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $", (PRUint32)164 }
+  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $", (PRUint32)164 }
 };
 #endif /* DEBUG */
 static const NSSItem nss_builtins_items_1 [] = {
   { (void *)&cko_netscape_builtin_root_list, (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 *)"Mozilla Builtin Roots", (PRUint32)22 }
@@ -1134,16 +1103,143 @@ static const NSSItem nss_builtins_items_
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
 static const NSSItem nss_builtins_items_4 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Thawte Personal Freemail CA", (PRUint32)28 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
+"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
+"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
+"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
+"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
+"\056\143\157\155"
+, (PRUint32)212 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
+"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
+"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
+"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
+"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
+"\056\143\157\155"
+, (PRUint32)212 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+"\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
+"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162"
+"\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023"
+"\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006\003"
+"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163"
+"\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013\023"
+"\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123"
+"\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156"
+"\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167\164"
+"\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145\155"
+"\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110\206"
+"\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154\055"
+"\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145\056"
+"\143\157\155\060\036\027\015\071\066\060\061\060\061\060\060\060"
+"\060\060\060\132\027\015\062\060\061\062\063\061\062\063\065\071"
+"\065\071\132\060\201\321\061\013\060\011\006\003\125\004\006\023"
+"\002\132\101\061\025\060\023\006\003\125\004\010\023\014\127\145"
+"\163\164\145\162\156\040\103\141\160\145\061\022\060\020\006\003"
+"\125\004\007\023\011\103\141\160\145\040\124\157\167\156\061\032"
+"\060\030\006\003\125\004\012\023\021\124\150\141\167\164\145\040"
+"\103\157\156\163\165\154\164\151\156\147\061\050\060\046\006\003"
+"\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151"
+"\163\151\157\156\061\044\060\042\006\003\125\004\003\023\033\124"
+"\150\141\167\164\145\040\120\145\162\163\157\156\141\154\040\106"
+"\162\145\145\155\141\151\154\040\103\101\061\053\060\051\006\011"
+"\052\206\110\206\367\015\001\011\001\026\034\160\145\162\163\157"
+"\156\141\154\055\146\162\145\145\155\141\151\154\100\164\150\141"
+"\167\164\145\056\143\157\155\060\201\237\060\015\006\011\052\206"
+"\110\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211"
+"\002\201\201\000\324\151\327\324\260\224\144\133\161\351\107\330"
+"\014\121\266\352\162\221\260\204\136\175\055\015\217\173\022\337"
+"\205\045\165\050\164\072\102\054\143\047\237\225\173\113\357\176"
+"\031\207\035\206\352\243\335\271\316\226\144\032\302\024\156\104"
+"\254\174\346\217\350\115\017\161\037\100\070\246\000\243\207\170"
+"\366\371\224\206\136\255\352\300\136\166\353\331\024\243\135\156"
+"\172\174\014\245\113\125\177\006\031\051\177\236\232\046\325\152"
+"\273\070\044\010\152\230\307\261\332\243\230\221\375\171\333\345"
+"\132\304\034\271\002\003\001\000\001\243\023\060\021\060\017\006"
+"\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\015"
+"\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201"
+"\000\307\354\222\176\116\370\365\226\245\147\142\052\244\360\115"
+"\021\140\320\157\215\140\130\141\254\046\273\122\065\134\010\317"
+"\060\373\250\112\226\212\037\142\102\043\214\027\017\364\272\144"
+"\234\027\254\107\051\337\235\230\136\322\154\140\161\134\242\254"
+"\334\171\343\347\156\000\107\037\265\015\050\350\002\235\344\232"
+"\375\023\364\246\331\174\261\370\334\137\043\046\011\221\200\163"
+"\320\024\033\336\103\251\203\045\362\346\234\057\025\312\376\246"
+"\253\212\007\165\213\014\335\121\204\153\344\370\321\316\167\242"
+"\201"
+, (PRUint32)817 }
+};
+static const NSSItem nss_builtins_items_5 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Thawte Personal Freemail CA", (PRUint32)28 },
+  { (void *)"\040\231\000\266\075\225\127\050\024\014\321\066\042\330\306\207"
+"\244\353\000\205"
+, (PRUint32)20 },
+  { (void *)"\036\164\303\206\074\014\065\305\076\302\177\357\074\252\074\331"
+, (PRUint32)16 },
+  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
+"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
+"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
+"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
+"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
+"\056\143\157\155"
+, (PRUint32)212 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_6 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Thawte Server CA", (PRUint32)17 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\304\061\013\060\011\006\003\125\004\006\023\002\132\101"
 "\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
 "\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
 "\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006"
 "\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156"
 "\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003"
@@ -1219,17 +1315,17 @@ static const NSSItem nss_builtins_items_
 "\225\075\241\213\267\013\142\230\172\165\212\335\210\116\116\236"
 "\100\333\250\314\062\164\271\157\015\306\343\263\104\013\331\212"
 "\157\232\051\233\231\030\050\073\321\343\100\050\232\132\074\325"
 "\265\347\040\033\213\312\244\253\215\351\121\331\342\114\054\131"
 "\251\332\271\262\165\033\366\102\362\357\307\362\030\371\211\274"
 "\243\377\212\043\056\160\107"
 , (PRUint32)791 }
 };
-static const NSSItem nss_builtins_items_5 [] = {
+static const NSSItem nss_builtins_items_7 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Thawte Server CA", (PRUint32)17 },
   { (void *)"\043\345\224\224\121\225\362\101\110\003\264\325\144\322\243\243"
 "\365\330\213\214"
 , (PRUint32)20 },
@@ -1251,17 +1347,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)199 },
   { (void *)"\002\001\001"
 , (PRUint32)3 },
   { (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_6 [] = {
+static const NSSItem nss_builtins_items_8 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Thawte Premium Server CA", (PRUint32)25 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101"
 "\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
@@ -1344,17 +1440,17 @@ static const NSSItem nss_builtins_items_
 "\205\374\311\001\070\377\115\276\362\026\102\103\347\273\132\106"
 "\373\301\306\021\037\361\112\260\050\106\311\303\304\102\175\274"
 "\372\253\131\156\325\267\121\210\021\343\244\205\031\153\202\114"
 "\244\014\022\255\351\244\256\077\361\303\111\145\232\214\305\310"
 "\076\045\267\224\231\273\222\062\161\007\360\206\136\355\120\047"
 "\246\015\246\043\371\273\313\246\007\024\102"
 , (PRUint32)811 }
 };
-static const NSSItem nss_builtins_items_7 [] = {
+static const NSSItem nss_builtins_items_9 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Thawte Premium Server CA", (PRUint32)25 },
   { (void *)"\142\177\215\170\047\145\143\231\322\175\177\220\104\311\376\263"
 "\363\076\372\232"
 , (PRUint32)20 },
@@ -1377,17 +1473,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)209 },
   { (void *)"\002\001\001"
 , (PRUint32)3 },
   { (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_8 [] = {
+static const NSSItem nss_builtins_items_10 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Equifax Secure CA", (PRUint32)18 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\020\060\016\006\003\125\004\012\023\007\105\161\165\151\146\141"
@@ -1452,17 +1548,17 @@ static const NSSItem nss_builtins_items_
 "\356\250\377\132\310\323\125\262\146\161\127\336\300\041\353\075"
 "\052\247\043\111\001\004\206\102\173\374\356\177\242\026\122\265"
 "\147\147\323\100\333\073\046\130\262\050\167\075\256\024\167\141"
 "\326\372\052\146\047\240\015\372\247\163\134\352\160\361\224\041"
 "\145\104\137\372\374\357\051\150\251\242\207\171\357\171\357\117"
 "\254\007\167\070"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_9 [] = {
+static const NSSItem nss_builtins_items_11 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Equifax Secure CA", (PRUint32)18 },
   { (void *)"\322\062\011\255\043\323\024\043\041\164\344\015\177\235\142\023"
 "\227\206\143\072"
 , (PRUint32)20 },
@@ -1476,17 +1572,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)80 },
   { (void *)"\002\004\065\336\364\317"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_10 [] = {
+static const NSSItem nss_builtins_items_12 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Digital Signature Trust Co. Global CA 1", (PRUint32)40 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\106\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\044\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141"
@@ -1551,17 +1647,17 @@ static const NSSItem nss_builtins_items_
 "\102\307\222\046\240\134\064\232\070\162\370\375\153\026\076\040"
 "\356\202\213\061\052\223\066\205\043\210\212\074\003\150\323\311"
 "\011\017\115\374\154\244\332\050\162\223\016\211\200\260\175\376"
 "\200\157\145\155\030\063\227\213\302\153\211\356\140\075\310\233"
 "\357\177\053\062\142\163\223\313\074\343\173\342\166\170\105\274"
 "\241\223\004\273\206\237\072\133\103\172\303\212\145"
 , (PRUint32)813 }
 };
-static const NSSItem nss_builtins_items_11 [] = {
+static const NSSItem nss_builtins_items_13 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Digital Signature Trust Co. Global CA 1", (PRUint32)40 },
   { (void *)"\201\226\213\072\357\034\334\160\365\372\062\151\302\222\243\143"
 "\133\321\043\323"
 , (PRUint32)20 },
@@ -1575,17 +1671,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)72 },
   { (void *)"\002\004\066\160\025\226"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_12 [] = {
+static const NSSItem nss_builtins_items_14 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Digital Signature Trust Co. Global CA 3", (PRUint32)40 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\106\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\044\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141"
@@ -1650,17 +1746,17 @@ static const NSSItem nss_builtins_items_
 "\305\327\364\012\045\017\075\170\201\236\017\261\147\304\220\114"
 "\143\335\136\247\342\272\237\365\367\115\245\061\173\234\051\055"
 "\114\376\144\076\354\266\123\376\352\233\355\202\333\164\165\113"
 "\007\171\156\036\330\031\203\163\336\365\076\320\265\336\347\113"
 "\150\175\103\056\052\040\341\176\240\170\104\236\010\365\230\371"
 "\307\177\033\033\326\006\040\002\130\241\303\242\003"
 , (PRUint32)813 }
 };
-static const NSSItem nss_builtins_items_13 [] = {
+static const NSSItem nss_builtins_items_15 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Digital Signature Trust Co. Global CA 3", (PRUint32)40 },
   { (void *)"\253\110\363\063\333\004\253\271\300\162\332\133\014\301\320\127"
 "\360\066\233\106"
 , (PRUint32)20 },
@@ -1674,17 +1770,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)72 },
   { (void *)"\002\004\066\156\323\316"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_14 [] = {
+static const NSSItem nss_builtins_items_16 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 1 Public Primary Certification Authority", (PRUint32)56 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151"
@@ -1740,17 +1836,17 @@ static const NSSItem nss_builtins_items_
 "\220\222\166\371\342\274\112\351\217\315\240\200\012\367\305\051"
 "\361\202\042\135\270\261\335\201\043\243\173\045\025\106\060\171"
 "\026\370\352\005\113\224\177\035\302\034\310\343\267\364\020\100"
 "\074\023\303\137\037\123\350\110\344\206\264\173\241\065\260\173"
 "\045\272\270\323\216\253\077\070\235\000\064\000\230\363\321\161"
 "\224"
 , (PRUint32)577 }
 };
-static const NSSItem nss_builtins_items_15 [] = {
+static const NSSItem nss_builtins_items_17 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 1 Public Primary Certification Authority", (PRUint32)56 },
   { (void *)"\220\256\242\151\205\377\024\200\114\103\111\122\354\351\140\204"
 "\167\257\125\157"
 , (PRUint32)20 },
@@ -1767,17 +1863,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\021\000\315\272\177\126\360\337\344\274\124\376\042\254\263"
 "\162\252\125"
 , (PRUint32)19 },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_16 [] = {
+static const NSSItem nss_builtins_items_18 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 2 Public Primary Certification Authority", (PRUint32)56 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151"
@@ -1832,17 +1928,17 @@ static const NSSItem nss_builtins_items_
 "\047\312\105\122\316\026\357\077\006\144\347\224\150\174\140\063"
 "\025\021\151\257\235\142\215\243\003\124\153\246\276\345\356\005"
 "\030\140\004\277\102\200\375\320\250\250\036\001\073\367\243\134"
 "\257\243\334\346\046\200\043\074\270\104\164\367\012\256\111\213"
 "\141\170\314\044\277\210\212\247\016\352\163\031\101\375\115\003"
 "\360\210\321\345\170\215\245\052\117\366\227\015\027\167\312\330"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_17 [] = {
+static const NSSItem nss_builtins_items_19 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 2 Public Primary Certification Authority", (PRUint32)56 },
   { (void *)"\147\202\252\340\355\356\342\032\130\071\323\300\315\024\150\012"
 "\117\140\024\052"
 , (PRUint32)20 },
@@ -1859,17 +1955,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\055\033\374\112\027\215\243\221\353\347\377\365\213\105"
 "\276\013"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_18 [] = {
+static const NSSItem nss_builtins_items_20 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 3 Public Primary Certification Authority", (PRUint32)56 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151"
@@ -1924,17 +2020,17 @@ static const NSSItem nss_builtins_items_
 "\225\274\035\217\154\054\250\121\314\163\330\244\300\123\360\116"
 "\326\046\300\166\001\127\201\222\136\041\361\321\261\377\347\320"
 "\041\130\315\151\027\343\104\034\234\031\104\071\211\134\334\234"
 "\000\017\126\215\002\231\355\242\220\105\114\344\273\020\244\075"
 "\360\062\003\016\361\316\370\350\311\121\214\346\142\237\346\237"
 "\300\175\267\162\234\311\066\072\153\237\116\250\377\144\015\144"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_19 [] = {
+static const NSSItem nss_builtins_items_21 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 3 Public Primary Certification Authority", (PRUint32)56 },
   { (void *)"\164\054\061\222\346\007\344\044\353\105\111\124\053\341\273\305"
 "\076\141\164\342"
 , (PRUint32)20 },
@@ -1951,17 +2047,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314"
 "\272\277"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_20 [] = {
+static const NSSItem nss_builtins_items_22 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 1 Public Primary Certification Authority - G2", (PRUint32)61 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123"
@@ -2041,17 +2137,17 @@ static const NSSItem nss_builtins_items_
 "\261\135\363\307\266\012\333\340\025\223\015\335\003\274\307\166"
 "\212\265\335\117\303\233\023\165\270\001\300\346\311\133\153\245"
 "\270\211\334\254\244\335\162\355\116\241\367\117\274\006\323\352"
 "\310\144\164\173\302\225\101\234\145\163\130\361\220\232\074\152"
 "\261\230\311\304\207\274\317\105\155\105\342\156\042\077\376\274"
 "\017\061\134\350\362\331"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_21 [] = {
+static const NSSItem nss_builtins_items_23 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 1 Public Primary Certification Authority - G2", (PRUint32)61 },
   { (void *)"\047\076\341\044\127\375\304\371\014\125\350\053\126\026\177\142"
 "\365\062\345\107"
 , (PRUint32)20 },
@@ -2074,17 +2170,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\114\307\352\252\230\076\161\323\223\020\370\075\072\211"
 "\221\222"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_22 [] = {
+static const NSSItem nss_builtins_items_24 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 2 Public Primary Certification Authority - G2", (PRUint32)61 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123"
@@ -2164,17 +2260,17 @@ static const NSSItem nss_builtins_items_
 "\225\366\044\140\206\115\104\056\203\245\304\055\240\323\256\170"
 "\151\157\162\332\154\256\010\360\143\222\067\346\273\304\060\027"
 "\255\167\314\111\065\252\317\330\217\321\276\267\030\226\107\163"
 "\152\124\042\064\144\055\266\026\233\131\133\264\121\131\072\263"
 "\013\024\364\022\337\147\240\364\255\062\144\136\261\106\162\047"
 "\214\022\173\305\104\264\256"
 , (PRUint32)775 }
 };
-static const NSSItem nss_builtins_items_23 [] = {
+static const NSSItem nss_builtins_items_25 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 2 Public Primary Certification Authority - G2", (PRUint32)61 },
   { (void *)"\263\352\304\107\166\311\310\034\352\362\235\225\266\314\240\010"
 "\033\147\354\235"
 , (PRUint32)20 },
@@ -2197,17 +2293,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\021\000\271\057\140\314\210\237\241\172\106\011\270\133\160"
 "\154\212\257"
 , (PRUint32)19 },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_24 [] = {
+static const NSSItem nss_builtins_items_26 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 3 Public Primary Certification Authority - G2", (PRUint32)61 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123"
@@ -2287,17 +2383,17 @@ static const NSSItem nss_builtins_items_
 "\141\222\137\246\304\035\020\141\066\323\054\047\074\350\051\011"
 "\271\021\144\164\314\265\163\237\034\110\251\274\141\001\356\342"
 "\027\246\014\343\100\010\073\016\347\353\104\163\052\232\361\151"
 "\222\357\161\024\303\071\254\161\247\221\011\157\344\161\006\263"
 "\272\131\127\046\171\000\366\370\015\242\063\060\050\324\252\130"
 "\240\235\235\151\221\375"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_25 [] = {
+static const NSSItem nss_builtins_items_27 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 3 Public Primary Certification Authority - G2", (PRUint32)61 },
   { (void *)"\205\067\034\246\345\120\024\075\316\050\003\107\033\336\072\011"
 "\350\370\167\017"
 , (PRUint32)20 },
@@ -2320,17 +2416,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\175\331\376\007\317\250\036\267\020\171\147\373\247\211"
 "\064\306"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_26 [] = {
+static const NSSItem nss_builtins_items_28 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 4 Public Primary Certification Authority - G2", (PRUint32)61 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\301\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123"
@@ -2410,17 +2506,17 @@ static const NSSItem nss_builtins_items_
 "\104\133\267\237\201\073\222\150\075\342\067\044\365\173\154\217"
 "\166\065\226\011\250\131\235\271\316\043\253\164\326\203\375\062"
 "\163\047\330\151\076\103\164\366\256\305\211\232\347\123\174\351"
 "\173\366\113\363\301\145\203\336\215\212\234\074\210\215\071\131"
 "\374\252\077\042\215\241\301\146\120\201\162\114\355\042\144\117"
 "\117\312\200\221\266\051"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_27 [] = {
+static const NSSItem nss_builtins_items_29 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 4 Public Primary Certification Authority - G2", (PRUint32)61 },
   { (void *)"\013\167\276\273\313\172\242\107\005\336\314\017\275\152\002\374"
 "\172\275\233\122"
 , (PRUint32)20 },
@@ -2443,17 +2539,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067"
 "\045\370"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_28 [] = {
+static const NSSItem nss_builtins_items_30 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GlobalSign Root CA", (PRUint32)19 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\127\061\013\060\011\006\003\125\004\006\023\002\102\105\061"
 "\031\060\027\006\003\125\004\012\023\020\107\154\157\142\141\154"
@@ -2525,17 +2621,17 @@ static const NSSItem nss_builtins_items_
 "\052\304\126\061\225\320\147\211\205\053\371\154\246\135\106\235"
 "\014\252\202\344\231\121\335\160\267\333\126\075\141\344\152\341"
 "\134\326\366\376\075\336\101\314\007\256\143\122\277\123\123\364"
 "\053\351\307\375\266\367\202\137\205\322\101\030\333\201\263\004"
 "\034\305\037\244\200\157\025\040\311\336\014\210\012\035\326\146"
 "\125\342\374\110\311\051\046\151\340"
 , (PRUint32)889 }
 };
-static const NSSItem nss_builtins_items_29 [] = {
+static const NSSItem nss_builtins_items_31 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GlobalSign Root CA", (PRUint32)19 },
   { (void *)"\261\274\226\213\324\364\235\142\052\250\232\201\362\025\001\122"
 "\244\035\202\234"
 , (PRUint32)20 },
@@ -2550,17 +2646,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)89 },
   { (void *)"\002\013\004\000\000\000\000\001\025\113\132\303\224"
 , (PRUint32)13 },
   { (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_30 [] = {
+static const NSSItem nss_builtins_items_32 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GlobalSign Root CA - R2", (PRUint32)24 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157"
 "\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040"
@@ -2634,17 +2730,17 @@ static const NSSItem nss_builtins_items_
 "\001\373\303\155\271\357\104\155\171\106\061\176\012\376\251\202"
 "\301\377\357\253\156\040\304\120\311\137\235\115\233\027\214\014"
 "\345\001\311\240\101\152\163\123\372\245\120\264\156\045\017\373"
 "\114\030\364\375\122\331\216\151\261\350\021\017\336\210\330\373"
 "\035\111\367\252\336\225\317\040\170\302\140\022\333\045\100\214"
 "\152\374\176\102\070\100\144\022\367\236\201\341\223\056"
 , (PRUint32)958 }
 };
-static const NSSItem nss_builtins_items_31 [] = {
+static const NSSItem nss_builtins_items_33 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GlobalSign Root CA - R2", (PRUint32)24 },
   { (void *)"\165\340\253\266\023\205\022\047\034\004\370\137\335\336\070\344"
 "\267\044\056\376"
 , (PRUint32)20 },
@@ -2658,17 +2754,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)78 },
   { (void *)"\002\013\004\000\000\000\000\001\017\206\046\346\015"
 , (PRUint32)13 },
   { (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_32 [] = {
+static const NSSItem nss_builtins_items_34 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"ValiCert Class 1 VA", (PRUint32)20 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141"
 "\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157"
@@ -2743,17 +2839,17 @@ static const NSSItem nss_builtins_items_
 "\322\265\247\122\376\234\261\266\342\133\167\027\100\352\162\326"
 "\043\313\050\201\062\303\000\171\030\354\131\027\211\311\306\152"
 "\036\161\311\375\267\164\245\045\105\151\305\110\253\031\341\105"
 "\212\045\153\031\356\345\273\022\365\177\367\246\215\121\303\360"
 "\235\164\267\251\076\240\245\377\266\111\003\023\332\042\314\355"
 "\161\202\053\231\317\072\267\365\055\162\310"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_33 [] = {
+static const NSSItem nss_builtins_items_35 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"ValiCert Class 1 VA", (PRUint32)20 },
   { (void *)"\345\337\164\074\266\001\304\233\230\103\334\253\214\350\152\201"
 "\020\237\344\216"
 , (PRUint32)20 },
@@ -2774,17 +2870,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)190 },
   { (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_34 [] = {
+static const NSSItem nss_builtins_items_36 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"ValiCert Class 2 VA", (PRUint32)20 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141"
 "\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157"
@@ -2859,17 +2955,17 @@ static const NSSItem nss_builtins_items_
 "\250\130\177\241\171\000\265\273\351\215\257\101\331\017\064\356"
 "\041\201\031\240\062\111\050\364\304\216\126\325\122\063\375\120"
 "\325\176\231\154\003\344\311\114\374\313\154\253\146\263\112\041"
 "\214\345\265\014\062\076\020\262\314\154\241\334\232\230\114\002"
 "\133\363\316\271\236\245\162\016\112\267\077\074\346\026\150\370"
 "\276\355\164\114\274\133\325\142\037\103\335"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_35 [] = {
+static const NSSItem nss_builtins_items_37 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"ValiCert Class 2 VA", (PRUint32)20 },
   { (void *)"\061\172\052\320\177\053\063\136\365\241\303\116\113\127\350\267"
 "\330\361\374\246"
 , (PRUint32)20 },
@@ -2890,17 +2986,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)190 },
   { (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_36 [] = {
+static const NSSItem nss_builtins_items_38 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"RSA Root Certificate 1", (PRUint32)23 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\273\061\044\060\042\006\003\125\004\007\023\033\126\141"
 "\154\151\103\145\162\164\040\126\141\154\151\144\141\164\151\157"
@@ -2975,17 +3071,17 @@ static const NSSItem nss_builtins_items_
 "\076\317\251\124\364\361\330\222\026\214\321\004\313\113\253\311"
 "\237\105\256\074\212\251\260\161\063\135\310\305\127\337\257\250"
 "\065\263\177\211\207\351\350\045\222\270\177\205\172\256\326\274"
 "\036\067\130\052\147\311\221\317\052\201\076\355\306\071\337\300"
 "\076\031\234\031\314\023\115\202\101\265\214\336\340\075\140\010"
 "\040\017\105\176\153\242\177\243\214\025\356"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_37 [] = {
+static const NSSItem nss_builtins_items_39 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"RSA Root Certificate 1", (PRUint32)23 },
   { (void *)"\151\275\214\364\234\323\000\373\131\056\027\223\312\125\152\363"
 "\354\252\065\373"
 , (PRUint32)20 },
@@ -3006,17 +3102,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)190 },
   { (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_38 [] = {
+static const NSSItem nss_builtins_items_40 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 1 Public Primary Certification Authority - G3", (PRUint32)61 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123"
@@ -3113,17 +3209,17 @@ static const NSSItem nss_builtins_items_
 "\245\040\200\151\150\241\117\176\341\153\317\007\101\372\203\216"
 "\274\070\335\260\056\021\261\153\262\102\314\232\274\371\110\042"
 "\171\112\031\017\262\034\076\040\164\331\152\303\276\362\050\170"
 "\023\126\171\117\155\120\352\033\260\265\127\261\067\146\130\043"
 "\363\334\017\337\012\207\304\357\206\005\325\070\024\140\231\243"
 "\113\336\006\226\161\054\362\333\266\037\244\357\077\356"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_39 [] = {
+static const NSSItem nss_builtins_items_41 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 1 Public Primary Certification Authority - G3", (PRUint32)61 },
   { (void *)"\040\102\205\334\367\353\166\101\225\127\216\023\153\324\267\321"
 "\351\216\106\245"
 , (PRUint32)20 },
@@ -3146,17 +3242,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\021\000\213\133\165\126\204\124\205\013\000\317\257\070\110"
 "\316\261\244"
 , (PRUint32)19 },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_40 [] = {
+static const NSSItem nss_builtins_items_42 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 2 Public Primary Certification Authority - G3", (PRUint32)61 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123"
@@ -3253,17 +3349,17 @@ static const NSSItem nss_builtins_items_
 "\260\177\373\066\045\332\225\320\361\044\024\027\335\030\200\153"
 "\106\043\071\124\365\216\142\011\004\035\224\220\246\233\346\045"
 "\342\102\105\252\270\220\255\276\010\217\251\013\102\030\224\317"
 "\162\071\341\261\103\340\050\317\267\347\132\154\023\153\111\263"
 "\377\343\030\174\211\213\063\135\254\063\327\247\371\332\072\125"
 "\311\130\020\371\252\357\132\266\317\113\113\337\052"
 , (PRUint32)1053 }
 };
-static const NSSItem nss_builtins_items_41 [] = {
+static const NSSItem nss_builtins_items_43 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 2 Public Primary Certification Authority - G3", (PRUint32)61 },
   { (void *)"\141\357\103\327\177\312\324\141\121\274\230\340\303\131\022\257"
 "\237\353\143\021"
 , (PRUint32)20 },
@@ -3286,17 +3382,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\141\160\313\111\214\137\230\105\051\347\260\246\331\120"
 "\133\172"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_42 [] = {
+static const NSSItem nss_builtins_items_44 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 3 Public Primary Certification Authority - G3", (PRUint32)61 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123"
@@ -3393,17 +3489,17 @@ static const NSSItem nss_builtins_items_
 "\027\201\053\132\067\311\136\052\364\306\342\241\134\124\233\246"
 "\124\000\317\360\361\301\307\230\060\032\073\066\026\333\243\156"
 "\352\375\255\262\302\332\357\002\107\023\212\300\361\263\061\255"
 "\117\034\341\117\234\257\017\014\235\367\170\015\330\364\065\126"
 "\200\332\267\155\027\217\235\036\201\144\341\376\305\105\272\255"
 "\153\271\012\172\116\117\113\204\356\113\361\175\335\021"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_43 [] = {
+static const NSSItem nss_builtins_items_45 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 3 Public Primary Certification Authority - G3", (PRUint32)61 },
   { (void *)"\023\055\015\105\123\113\151\227\315\262\325\303\071\342\125\166"
 "\140\233\134\306"
 , (PRUint32)20 },
@@ -3426,17 +3522,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\021\000\233\176\006\111\243\076\142\271\325\356\220\110\161"
 "\051\357\127"
 , (PRUint32)19 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_44 [] = {
+static const NSSItem nss_builtins_items_46 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 4 Public Primary Certification Authority - G3", (PRUint32)61 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123"
@@ -3533,17 +3629,17 @@ static const NSSItem nss_builtins_items_
 "\330\325\074\102\035\027\301\022\135\105\070\303\070\363\374\205"
 "\056\203\106\110\262\327\040\137\222\066\217\347\171\017\230\136"
 "\231\350\360\320\244\273\365\123\275\052\316\131\260\257\156\177"
 "\154\273\322\036\000\260\041\355\370\101\142\202\271\330\262\304"
 "\273\106\120\363\061\305\217\001\250\164\353\365\170\047\332\347"
 "\367\146\103\363\236\203\076\040\252\303\065\140\221\316"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_45 [] = {
+static const NSSItem nss_builtins_items_47 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Verisign Class 4 Public Primary Certification Authority - G3", (PRUint32)61 },
   { (void *)"\310\354\214\207\222\151\313\113\253\071\351\215\176\127\147\363"
 "\024\225\163\235"
 , (PRUint32)20 },
@@ -3566,17 +3662,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\021\000\354\240\247\213\156\165\152\001\317\304\174\314\057"
 "\224\136\327"
 , (PRUint32)19 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_46 [] = {
+static const NSSItem nss_builtins_items_48 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Entrust.net Secure Server CA", (PRUint32)29 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\303\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
@@ -3684,17 +3780,17 @@ static const NSSItem nss_builtins_items_
 "\367\222\276\361\303\325\325\225\152\004\273\054\316\046\066\145"
 "\310\061\306\347\356\077\343\127\165\204\172\021\357\106\117\030"
 "\364\323\230\273\250\207\062\272\162\366\074\342\075\237\327\035"
 "\331\303\140\103\214\130\016\042\226\057\142\243\054\037\272\255"
 "\005\357\253\062\170\207\240\124\163\031\265\134\005\371\122\076"
 "\155\055\105\013\367\012\223\352\355\006\371\262"
 , (PRUint32)1244 }
 };
-static const NSSItem nss_builtins_items_47 [] = {
+static const NSSItem nss_builtins_items_49 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Entrust.net Secure Server CA", (PRUint32)29 },
   { (void *)"\231\246\233\346\032\376\210\153\115\053\202\000\174\270\124\374"
 "\061\176\025\071"
 , (PRUint32)20 },
@@ -3716,17 +3812,169 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)198 },
   { (void *)"\002\004\067\112\322\103"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_48 [] = {
+static const NSSItem nss_builtins_items_50 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
+"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
+"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
+"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
+"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
+"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
+"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
+"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
+"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
+"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
+"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)204 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
+"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
+"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
+"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
+"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
+"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
+"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
+"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
+"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
+"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
+"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)204 },
+  { (void *)"\002\004\070\003\221\356"
+, (PRUint32)6 },
+  { (void *)"\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070"
+"\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004"
+"\005\000\060\201\311\061\013\060\011\006\003\125\004\006\023\002"
+"\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
+"\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004"
+"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156"
+"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146"
+"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
+"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141"
+"\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
+"\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145"
+"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
+"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
+"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036"
+"\027\015\071\071\061\060\061\062\061\071\062\064\063\060\132\027"
+"\015\061\071\061\060\061\062\061\071\065\064\063\060\132\060\201"
+"\311\061\013\060\011\006\003\125\004\006\023\002\125\123\061\024"
+"\060\022\006\003\125\004\012\023\013\105\156\164\162\165\163\164"
+"\056\156\145\164\061\110\060\106\006\003\125\004\013\024\077\167"
+"\167\167\056\145\156\164\162\165\163\164\056\156\145\164\057\103"
+"\154\151\145\156\164\137\103\101\137\111\156\146\157\057\103\120"
+"\123\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146"
+"\056\040\154\151\155\151\164\163\040\154\151\141\142\056\061\045"
+"\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071\071"
+"\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151"
+"\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052"
+"\105\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145"
+"\156\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
+"\040\101\165\164\150\157\162\151\164\171\060\201\235\060\015\006"
+"\011\052\206\110\206\367\015\001\001\001\005\000\003\201\213\000"
+"\060\201\207\002\201\201\000\310\072\231\136\061\027\337\254\047"
+"\157\220\173\344\031\377\105\243\064\302\333\301\250\117\360\150"
+"\352\204\375\237\165\171\317\301\212\121\224\257\307\127\003\107"
+"\144\236\255\202\033\132\332\177\067\170\107\273\067\230\022\226"
+"\316\306\023\175\357\322\014\060\121\251\071\236\125\370\373\261"
+"\347\060\336\203\262\272\076\361\325\211\073\073\205\272\252\164"
+"\054\376\077\061\156\257\221\225\156\006\324\007\115\113\054\126"
+"\107\030\004\122\332\016\020\223\277\143\220\233\341\337\214\346"
+"\002\244\346\117\136\367\213\002\001\003\243\202\001\340\060\202"
+"\001\334\060\021\006\011\140\206\110\001\206\370\102\001\001\004"
+"\004\003\002\000\007\060\202\001\042\006\003\125\035\037\004\202"
+"\001\031\060\202\001\025\060\201\344\240\201\341\240\201\336\244"
+"\201\333\060\201\330\061\013\060\011\006\003\125\004\006\023\002"
+"\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
+"\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004"
+"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156"
+"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146"
+"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
+"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141"
+"\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
+"\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145"
+"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
+"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
+"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015"
+"\060\013\006\003\125\004\003\023\004\103\122\114\061\060\054\240"
+"\052\240\050\206\046\150\164\164\160\072\057\057\167\167\167\056"
+"\145\156\164\162\165\163\164\056\156\145\164\057\103\122\114\057"
+"\103\154\151\145\156\164\061\056\143\162\154\060\053\006\003\125"
+"\035\020\004\044\060\042\200\017\061\071\071\071\061\060\061\062"
+"\061\071\062\064\063\060\132\201\017\062\060\061\071\061\060\061"
+"\062\061\071\062\064\063\060\132\060\013\006\003\125\035\017\004"
+"\004\003\002\001\006\060\037\006\003\125\035\043\004\030\060\026"
+"\200\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312"
+"\231\164\213\225\352\114\060\035\006\003\125\035\016\004\026\004"
+"\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312\231"
+"\164\213\225\352\114\060\014\006\003\125\035\023\004\005\060\003"
+"\001\001\377\060\031\006\011\052\206\110\206\366\175\007\101\000"
+"\004\014\060\012\033\004\126\064\056\060\003\002\004\220\060\015"
+"\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201"
+"\000\077\256\212\361\327\146\003\005\236\076\372\352\034\106\273"
+"\244\133\217\170\232\022\110\231\371\364\065\336\014\066\007\002"
+"\153\020\072\211\024\201\234\061\246\174\262\101\262\152\347\007"
+"\001\241\113\371\237\045\073\226\312\231\303\076\241\121\034\363"
+"\303\056\104\367\260\147\106\252\222\345\073\332\034\031\024\070"
+"\060\325\342\242\061\045\056\361\354\105\070\355\370\006\130\003"
+"\163\142\260\020\061\217\100\277\144\340\134\076\305\117\037\332"
+"\022\103\377\114\346\006\046\250\233\031\252\104\074\166\262\134"
+"\354"
+, (PRUint32)1265 }
+};
+static const NSSItem nss_builtins_items_51 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 },
+  { (void *)"\332\171\301\161\021\120\302\064\071\252\053\013\014\142\375\125"
+"\262\371\365\200"
+, (PRUint32)20 },
+  { (void *)"\014\101\057\023\133\240\124\365\226\146\055\176\315\016\003\364"
+, (PRUint32)16 },
+  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
+"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
+"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
+"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
+"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
+"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
+"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
+"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
+"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
+"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
+"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)204 },
+  { (void *)"\002\004\070\003\221\356"
+, (PRUint32)6 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_52 [] = {
   { (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 *)"Entrust.net Premium 2048 Secure Server CA", (PRUint32)42 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
 "\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
@@ -3824,17 +4072,17 @@ static const NSSItem nss_builtins_items_
 "\015\063\333\004\321\346\111\100\023\053\166\373\076\351\234\211"
 "\017\025\316\030\260\205\170\041\117\153\117\016\372\066\147\315"
 "\007\362\377\010\320\342\336\331\277\052\257\270\207\206\041\074"
 "\004\312\267\224\150\177\317\074\351\230\327\070\377\354\300\331"
 "\120\360\056\113\130\256\106\157\320\056\303\140\332\162\125\162"
 "\275\114\105\236\141\272\277\204\201\222\003\321\322\151\174\305"
 , (PRUint32)1120 }
 };
-static const NSSItem nss_builtins_items_49 [] = {
+static const NSSItem nss_builtins_items_53 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Entrust.net Premium 2048 Secure Server CA", (PRUint32)42 },
   { (void *)"\200\035\142\320\173\104\235\134\134\003\134\230\352\141\372\104"
 "\074\052\130\376"
 , (PRUint32)20 },
@@ -3855,17 +4103,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)183 },
   { (void *)"\002\004\070\143\271\146"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_50 [] = {
+static const NSSItem nss_builtins_items_54 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Baltimore CyberTrust Root", (PRUint32)26 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\111\105\061"
 "\022\060\020\006\003\125\004\012\023\011\102\141\154\164\151\155"
@@ -3937,17 +4185,17 @@ static const NSSItem nss_builtins_items_
 "\144\346\037\267\316\360\362\237\056\273\033\267\362\120\210\163"
 "\222\302\342\343\026\215\232\062\002\253\216\030\335\351\020\021"
 "\356\176\065\253\220\257\076\060\224\172\320\063\075\247\145\017"
 "\365\374\216\236\142\317\107\104\054\001\135\273\035\265\062\322"
 "\107\322\070\056\320\376\201\334\062\152\036\265\356\074\325\374"
 "\347\201\035\031\303\044\102\352\143\071\251"
 , (PRUint32)891 }
 };
-static const NSSItem nss_builtins_items_51 [] = {
+static const NSSItem nss_builtins_items_55 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Baltimore CyberTrust Root", (PRUint32)26 },
   { (void *)"\324\336\040\320\136\146\374\123\376\032\120\210\054\170\333\050"
 "\122\312\344\164"
 , (PRUint32)20 },
@@ -3962,17 +4210,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)92 },
   { (void *)"\002\004\002\000\000\271"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_52 [] = {
+static const NSSItem nss_builtins_items_56 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Equifax Secure Global eBusiness CA", (PRUint32)35 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\034\060\032\006\003\125\004\012\023\023\105\161\165\151\146\141"
@@ -4030,17 +4278,17 @@ static const NSSItem nss_builtins_items_
 "\147\275\001\257\315\340\161\374\132\317\144\304\340\226\230\320"
 "\243\100\342\001\212\357\047\007\361\145\001\212\104\055\006\145"
 "\165\122\300\206\020\040\041\137\154\153\017\154\256\011\034\257"
 "\362\242\030\064\304\165\244\163\034\361\215\334\357\255\371\263"
 "\166\264\222\277\334\225\020\036\276\313\310\073\132\204\140\031"
 "\126\224\251\125"
 , (PRUint32)660 }
 };
-static const NSSItem nss_builtins_items_53 [] = {
+static const NSSItem nss_builtins_items_57 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Equifax Secure Global eBusiness CA", (PRUint32)35 },
   { (void *)"\176\170\112\020\034\202\145\314\055\341\361\155\107\264\100\312"
 "\331\012\031\105"
 , (PRUint32)20 },
@@ -4055,17 +4303,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)92 },
   { (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_54 [] = {
+static const NSSItem nss_builtins_items_58 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Equifax Secure eBusiness CA 1", (PRUint32)30 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\123\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\034\060\032\006\003\125\004\012\023\023\105\161\165\151\146\141"
@@ -4122,17 +4370,17 @@ static const NSSItem nss_builtins_items_
 "\142\040\247\204\113\130\145\361\342\371\225\041\077\365\324\176"
 "\130\036\107\207\124\076\130\241\265\265\370\052\357\161\347\274"
 "\303\366\261\111\106\342\327\240\153\345\126\172\232\047\230\174"
 "\106\142\024\347\311\374\156\003\022\171\200\070\035\110\202\215"
 "\374\027\376\052\226\053\265\142\246\246\075\275\177\222\131\315"
 "\132\052\202\262\067\171"
 , (PRUint32)646 }
 };
-static const NSSItem nss_builtins_items_55 [] = {
+static const NSSItem nss_builtins_items_59 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Equifax Secure eBusiness CA 1", (PRUint32)30 },
   { (void *)"\332\100\030\213\221\211\243\355\356\256\332\227\376\057\235\365"
 "\267\321\212\101"
 , (PRUint32)20 },
@@ -4147,17 +4395,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)85 },
   { (void *)"\002\001\004"
 , (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_56 [] = {
+static const NSSItem nss_builtins_items_60 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Equifax Secure eBusiness CA 2", (PRUint32)30 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\027\060\025\006\003\125\004\012\023\016\105\161\165\151\146\141"
@@ -4222,17 +4470,17 @@ static const NSSItem nss_builtins_items_
 "\321\301\076\123\237\003\104\260\176\113\364\157\344\174\037\347"
 "\342\261\344\270\232\357\303\275\316\336\013\062\064\331\336\050"
 "\355\063\153\304\324\327\075\022\130\253\175\011\055\313\160\365"
 "\023\212\224\241\047\244\326\160\305\155\224\265\311\175\235\240"
 "\322\306\010\111\331\146\233\246\323\364\013\334\305\046\127\341"
 "\221\060\352\315"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_57 [] = {
+static const NSSItem nss_builtins_items_61 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Equifax Secure eBusiness CA 2", (PRUint32)30 },
   { (void *)"\071\117\366\205\013\006\276\122\345\030\126\314\020\341\200\350"
 "\202\263\205\314"
 , (PRUint32)20 },
@@ -4246,17 +4494,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)80 },
   { (void *)"\002\004\067\160\317\265"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_58 [] = {
+static const NSSItem nss_builtins_items_62 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"AddTrust Low-Value Services Root", (PRUint32)33 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061"
 "\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165"
@@ -4340,17 +4588,17 @@ static const NSSItem nss_builtins_items_
 "\247\077\376\321\146\255\013\274\153\231\206\357\077\175\363\030"
 "\062\312\173\306\343\253\144\106\225\370\046\151\331\125\203\173"
 "\054\226\007\377\131\054\104\243\306\345\351\251\334\241\143\200"
 "\132\041\136\041\317\123\124\360\272\157\211\333\250\252\225\317"
 "\213\343\161\314\036\033\040\104\010\300\172\266\100\375\304\344"
 "\065\341\035\026\034\320\274\053\216\326\161\331"
 , (PRUint32)1052 }
 };
-static const NSSItem nss_builtins_items_59 [] = {
+static const NSSItem nss_builtins_items_63 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"AddTrust Low-Value Services Root", (PRUint32)33 },
   { (void *)"\314\253\016\240\114\043\001\326\151\173\335\067\237\315\022\353"
 "\044\343\224\235"
 , (PRUint32)20 },
@@ -4366,17 +4614,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)103 },
   { (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_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_60 [] = {
+static const NSSItem nss_builtins_items_64 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"AddTrust External Root", (PRUint32)23 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\157\061\013\060\011\006\003\125\004\006\023\002\123\105\061"
 "\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165"
@@ -4464,17 +4712,17 @@ static const NSSItem nss_builtins_items_
 "\142\041\150\025\040\103\074\231\347\174\275\044\330\251\221\027"
 "\163\210\077\126\033\061\070\030\264\161\017\232\315\310\016\236"
 "\216\056\033\341\214\230\203\313\037\061\361\104\114\306\004\163"
 "\111\166\140\017\307\370\275\027\200\153\056\351\314\114\016\132"
 "\232\171\017\040\012\056\325\236\143\046\036\125\222\224\330\202"
 "\027\132\173\320\274\307\217\116\206\004"
 , (PRUint32)1082 }
 };
-static const NSSItem nss_builtins_items_61 [] = {
+static const NSSItem nss_builtins_items_65 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"AddTrust External Root", (PRUint32)23 },
   { (void *)"\002\372\363\342\221\103\124\150\140\170\127\151\115\365\344\133"
 "\150\205\030\150"
 , (PRUint32)20 },
@@ -4491,17 +4739,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)113 },
   { (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_62 [] = {
+static const NSSItem nss_builtins_items_66 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"AddTrust Public Services Root", (PRUint32)30 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\144\061\013\060\011\006\003\125\004\006\023\002\123\105\061"
 "\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165"
@@ -4585,17 +4833,17 @@ static const NSSItem nss_builtins_items_
 "\341\042\015\207\000\144\376\214\175\142\071\145\246\357\102\266"
 "\200\045\022\141\001\250\044\023\160\000\021\046\137\372\065\120"
 "\305\110\314\006\107\350\047\330\160\215\137\144\346\241\104\046"
 "\136\042\354\222\315\377\102\232\104\041\155\134\305\343\042\035"
 "\137\107\022\347\316\137\135\372\330\252\261\063\055\331\166\362"
 "\116\072\063\014\053\263\055\220\006"
 , (PRUint32)1049 }
 };
-static const NSSItem nss_builtins_items_63 [] = {
+static const NSSItem nss_builtins_items_67 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"AddTrust Public Services Root", (PRUint32)30 },
   { (void *)"\052\266\050\110\136\170\373\363\255\236\171\020\335\153\337\231"
 "\162\054\226\345"
 , (PRUint32)20 },
@@ -4611,17 +4859,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)102 },
   { (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_64 [] = {
+static const NSSItem nss_builtins_items_68 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"AddTrust Qualified Certificates Root", (PRUint32)37 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\147\061\013\060\011\006\003\125\004\006\023\002\123\105\061"
 "\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165"
@@ -4706,17 +4954,17 @@ static const NSSItem nss_builtins_items_
 "\011\371\277\122\241\356\302\200\076\006\134\056\125\100\301\033"
 "\365\160\105\260\334\135\372\366\162\132\167\322\143\315\317\130"
 "\211\000\102\143\077\171\071\320\104\260\202\156\101\031\350\335"
 "\340\301\210\132\321\036\161\223\037\044\060\164\345\036\250\336"
 "\074\047\067\177\203\256\236\167\317\360\060\261\377\113\231\350"
 "\306\241"
 , (PRUint32)1058 }
 };
-static const NSSItem nss_builtins_items_65 [] = {
+static const NSSItem nss_builtins_items_69 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"AddTrust Qualified Certificates Root", (PRUint32)37 },
   { (void *)"\115\043\170\354\221\225\071\265\000\177\165\217\003\073\041\036"
 "\305\115\213\317"
 , (PRUint32)20 },
@@ -4732,17 +4980,405 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)105 },
   { (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_66 [] = {
+static const NSSItem nss_builtins_items_70 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Thawte Time Stamping CA", (PRUint32)24 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
+"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
+"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
+"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
+"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
+"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
+, (PRUint32)142 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
+"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
+"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
+"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
+"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
+"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
+, (PRUint32)142 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+"\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
+"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162"
+"\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007\023"
+"\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060\015"
+"\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035\060"
+"\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060\035"
+"\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124\151"
+"\155\145\163\164\141\155\160\151\156\147\040\103\101\060\036\027"
+"\015\071\067\060\061\060\061\060\060\060\060\060\060\132\027\015"
+"\062\060\061\062\063\061\062\063\065\071\065\071\132\060\201\213"
+"\061\013\060\011\006\003\125\004\006\023\002\132\101\061\025\060"
+"\023\006\003\125\004\010\023\014\127\145\163\164\145\162\156\040"
+"\103\141\160\145\061\024\060\022\006\003\125\004\007\023\013\104"
+"\165\162\142\141\156\166\151\154\154\145\061\017\060\015\006\003"
+"\125\004\012\023\006\124\150\141\167\164\145\061\035\060\033\006"
+"\003\125\004\013\023\024\124\150\141\167\164\145\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\061\037\060\035\006\003"
+"\125\004\003\023\026\124\150\141\167\164\145\040\124\151\155\145"
+"\163\164\141\155\160\151\156\147\040\103\101\060\201\237\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
+"\000\060\201\211\002\201\201\000\326\053\130\170\141\105\206\123"
+"\352\064\173\121\234\355\260\346\056\030\016\376\340\137\250\047"
+"\323\264\311\340\174\131\116\026\016\163\124\140\301\177\366\237"
+"\056\351\072\205\044\025\074\333\107\004\143\303\236\304\224\032"
+"\132\337\114\172\363\331\103\035\074\020\172\171\045\333\220\376"
+"\360\121\347\060\326\101\000\375\237\050\337\171\276\224\273\235"
+"\266\024\343\043\205\327\251\101\340\114\244\171\260\053\032\213"
+"\362\370\073\212\076\105\254\161\222\000\264\220\101\230\373\137"
+"\355\372\267\056\212\370\210\067\002\003\001\000\001\243\023\060"
+"\021\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001"
+"\001\377\060\015\006\011\052\206\110\206\367\015\001\001\004\005"
+"\000\003\201\201\000\147\333\342\302\346\207\075\100\203\206\067"
+"\065\175\037\316\232\303\014\146\040\250\272\252\004\211\206\302"
+"\365\020\010\015\277\313\242\005\212\320\115\066\076\364\327\357"
+"\151\306\136\344\260\224\157\112\271\347\336\133\210\266\173\333"
+"\343\047\345\166\303\360\065\301\313\265\047\233\063\171\334\220"
+"\246\000\236\167\372\374\315\047\224\102\026\234\323\034\150\354"
+"\277\134\335\345\251\173\020\012\062\164\124\023\061\213\205\003"
+"\204\221\267\130\001\060\024\070\257\050\312\374\261\120\031\031"
+"\011\254\211\111\323"
+, (PRUint32)677 }
+};
+static const NSSItem nss_builtins_items_71 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Thawte Time Stamping CA", (PRUint32)24 },
+  { (void *)"\276\066\244\126\057\262\356\005\333\263\323\043\043\255\364\105"
+"\010\116\326\126"
+, (PRUint32)20 },
+  { (void *)"\177\146\172\161\323\353\151\170\040\232\121\024\235\203\332\040"
+, (PRUint32)16 },
+  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
+"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
+"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
+"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
+"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
+"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
+, (PRUint32)142 },
+  { (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_72 [] = {
+  { (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 *)"Entrust.net Global Secure Server CA", (PRUint32)36 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
+"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
+"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
+"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
+"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
+"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
+"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
+"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
+"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)189 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
+"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
+"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
+"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
+"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
+"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
+"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
+"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
+"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)189 },
+  { (void *)"\002\004\070\233\021\074"
+, (PRUint32)6 },
+  { (void *)"\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070"
+"\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004"
+"\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013"
+"\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075\006"
+"\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165\163"
+"\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151\156"
+"\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154"
+"\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043"
+"\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040"
+"\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151"
+"\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105\156"
+"\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162\145"
+"\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060"
+"\036\027\015\060\060\060\062\060\064\061\067\062\060\060\060\132"
+"\027\015\062\060\060\062\060\064\061\067\065\060\060\060\132\060"
+"\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
+"\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125\004"
+"\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056\156"
+"\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157\162"
+"\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155\151"
+"\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003\125"
+"\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156\164"
+"\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145\144"
+"\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162\165"
+"\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123\145"
+"\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\060\201\237\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201"
+"\215\000\060\201\211\002\201\201\000\307\301\137\116\161\361\316"
+"\360\140\206\017\322\130\177\323\063\227\055\027\242\165\060\265"
+"\226\144\046\057\150\303\104\253\250\165\346\000\147\064\127\236"
+"\145\307\042\233\163\346\323\335\010\016\067\125\252\045\106\201"
+"\154\275\376\250\366\165\127\127\214\220\154\112\303\076\213\113"
+"\103\012\311\021\126\232\232\047\042\231\317\125\236\141\331\002"
+"\342\174\266\174\070\007\334\343\177\117\232\271\003\101\200\266"
+"\165\147\023\013\237\350\127\066\310\135\000\066\336\146\024\332"
+"\156\166\037\117\067\214\202\023\211\002\003\001\000\001\243\202"
+"\001\244\060\202\001\240\060\021\006\011\140\206\110\001\206\370"
+"\102\001\001\004\004\003\002\000\007\060\201\343\006\003\125\035"
+"\037\004\201\333\060\201\330\060\201\325\240\201\322\240\201\317"
+"\244\201\314\060\201\311\061\024\060\022\006\003\125\004\012\023"
+"\013\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075"
+"\006\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165"
+"\163\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151"
+"\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050"
+"\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060"
+"\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060"
+"\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155"
+"\151\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105"
+"\156\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162"
+"\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\061\015\060\013\006\003\125\004\003\023\004\103\122\114\061\060"
+"\053\006\003\125\035\020\004\044\060\042\200\017\062\060\060\060"
+"\060\062\060\064\061\067\062\060\060\060\132\201\017\062\060\062"
+"\060\060\062\060\064\061\067\065\060\060\060\132\060\013\006\003"
+"\125\035\017\004\004\003\002\001\006\060\037\006\003\125\035\043"
+"\004\030\060\026\200\024\313\154\300\153\343\273\076\313\374\042"
+"\234\376\373\213\222\234\260\362\156\042\060\035\006\003\125\035"
+"\016\004\026\004\024\313\154\300\153\343\273\076\313\374\042\234"
+"\376\373\213\222\234\260\362\156\042\060\014\006\003\125\035\023"
+"\004\005\060\003\001\001\377\060\035\006\011\052\206\110\206\366"
+"\175\007\101\000\004\020\060\016\033\010\126\065\056\060\072\064"
+"\056\060\003\002\004\220\060\015\006\011\052\206\110\206\367\015"
+"\001\001\004\005\000\003\201\201\000\142\333\201\221\316\310\232"
+"\167\102\057\354\275\047\243\123\017\120\033\352\116\222\360\251"
+"\257\251\240\272\110\141\313\357\311\006\357\037\325\364\356\337"
+"\126\055\346\312\152\031\163\252\123\276\222\263\120\002\266\205"
+"\046\162\143\330\165\120\142\165\024\267\263\120\032\077\312\021"
+"\000\013\205\105\151\155\266\245\256\121\341\112\334\202\077\154"
+"\214\064\262\167\153\331\002\366\177\016\352\145\004\361\315\124"
+"\312\272\311\314\340\204\367\310\076\021\227\323\140\011\030\274"
+"\005\377\154\211\063\360\354\025\017"
+, (PRUint32)1177 }
+};
+static const NSSItem nss_builtins_items_73 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Entrust.net Global Secure Server CA", (PRUint32)36 },
+  { (void *)"\211\071\127\156\027\215\367\005\170\017\314\136\310\117\204\366"
+"\045\072\110\223"
+, (PRUint32)20 },
+  { (void *)"\235\146\152\314\377\325\365\103\264\277\214\026\321\053\250\231"
+, (PRUint32)16 },
+  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
+"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
+"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
+"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
+"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
+"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
+"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
+"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
+"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)189 },
+  { (void *)"\002\004\070\233\021\074"
+, (PRUint32)6 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_74 [] = {
+  { (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 *)"Entrust.net Global Secure Personal CA", (PRUint32)38 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
+"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
+"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171"
+, (PRUint32)183 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
+"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
+"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171"
+, (PRUint32)183 },
+  { (void *)"\002\004\070\236\366\344"
+, (PRUint32)6 },
+  { (void *)"\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070"
+"\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004"
+"\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013"
+"\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006"
+"\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163"
+"\164\056\156\145\164\057\107\103\103\101\137\103\120\123\040\151"
+"\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050"
+"\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060"
+"\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060"
+"\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155"
+"\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052\105"
+"\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145\156"
+"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\060\036\027\015\060\060\060"
+"\062\060\067\061\066\061\066\064\060\132\027\015\062\060\060\062"
+"\060\067\061\066\064\066\064\060\132\060\201\264\061\024\060\022"
+"\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156"
+"\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167"
+"\056\145\156\164\162\165\163\164\056\156\145\164\057\107\103\103"
+"\101\137\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
+"\040\162\145\146\056\040\050\154\151\155\151\164\163\040\154\151"
+"\141\142\056\051\061\045\060\043\006\003\125\004\013\023\034\050"
+"\143\051\040\062\060\060\060\040\105\156\164\162\165\163\164\056"
+"\156\145\164\040\114\151\155\151\164\145\144\061\063\060\061\006"
+"\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145"
+"\164\040\103\154\151\145\156\164\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001"
+"\005\000\003\201\215\000\060\201\211\002\201\201\000\223\164\264"
+"\266\344\305\113\326\241\150\177\142\325\354\367\121\127\263\162"
+"\112\230\365\320\211\311\255\143\315\115\065\121\152\204\324\255"
+"\311\150\171\157\270\353\021\333\207\256\134\044\121\023\361\124"
+"\045\204\257\051\053\237\343\200\342\331\313\335\306\105\111\064"
+"\210\220\136\001\227\357\352\123\246\335\374\301\336\113\052\045"
+"\344\351\065\372\125\005\006\345\211\172\352\244\021\127\073\374"
+"\174\075\066\315\147\065\155\244\251\045\131\275\146\365\371\047"
+"\344\225\147\326\077\222\200\136\362\064\175\053\205\002\003\001"
+"\000\001\243\202\001\236\060\202\001\232\060\021\006\011\140\206"
+"\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201\335"
+"\006\003\125\035\037\004\201\325\060\201\322\060\201\317\240\201"
+"\314\240\201\311\244\201\306\060\201\303\061\024\060\022\006\003"
+"\125\004\012\023\013\105\156\164\162\165\163\164\056\156\145\164"
+"\061\100\060\076\006\003\125\004\013\024\067\167\167\167\056\145"
+"\156\164\162\165\163\164\056\156\145\164\057\107\103\103\101\137"
+"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
+"\145\146\056\040\050\154\151\155\151\164\163\040\154\151\141\142"
+"\056\051\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
+"\040\062\060\060\060\040\105\156\164\162\165\163\164\056\156\145"
+"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
+"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
+"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015"
+"\060\013\006\003\125\004\003\023\004\103\122\114\061\060\053\006"
+"\003\125\035\020\004\044\060\042\200\017\062\060\060\060\060\062"
+"\060\067\061\066\061\066\064\060\132\201\017\062\060\062\060\060"
+"\062\060\067\061\066\064\066\064\060\132\060\013\006\003\125\035"
+"\017\004\004\003\002\001\006\060\037\006\003\125\035\043\004\030"
+"\060\026\200\024\204\213\164\375\305\215\300\377\047\155\040\067"
+"\105\174\376\055\316\272\323\175\060\035\006\003\125\035\016\004"
+"\026\004\024\204\213\164\375\305\215\300\377\047\155\040\067\105"
+"\174\376\055\316\272\323\175\060\014\006\003\125\035\023\004\005"
+"\060\003\001\001\377\060\035\006\011\052\206\110\206\366\175\007"
+"\101\000\004\020\060\016\033\010\126\065\056\060\072\064\056\060"
+"\003\002\004\220\060\015\006\011\052\206\110\206\367\015\001\001"
+"\004\005\000\003\201\201\000\116\157\065\200\073\321\212\365\016"
+"\247\040\313\055\145\125\320\222\364\347\204\265\006\046\203\022"
+"\204\013\254\073\262\104\356\275\317\100\333\040\016\272\156\024"
+"\352\060\340\073\142\174\177\213\153\174\112\247\325\065\074\276"
+"\250\134\352\113\273\223\216\200\146\253\017\051\375\115\055\277"
+"\032\233\012\220\305\253\332\321\263\206\324\057\044\122\134\172"
+"\155\306\362\376\345\115\032\060\214\220\362\272\327\112\076\103"
+"\176\324\310\120\032\207\370\117\201\307\166\013\204\072\162\235"
+"\316\145\146\227\256\046\136"
+, (PRUint32)1159 }
+};
+static const NSSItem nss_builtins_items_75 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Entrust.net Global Secure Personal CA", (PRUint32)38 },
+  { (void *)"\317\164\277\377\233\206\201\133\010\063\124\100\066\076\207\266"
+"\266\360\277\163"
+, (PRUint32)20 },
+  { (void *)"\232\167\031\030\355\226\317\337\033\267\016\365\215\271\210\056"
+, (PRUint32)16 },
+  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
+"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
+"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171"
+, (PRUint32)183 },
+  { (void *)"\002\004\070\236\366\344"
+, (PRUint32)6 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_76 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Entrust Root Certification Authority", (PRUint32)37 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\260\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\026\060\024\006\003\125\004\012\023\015\105\156\164\162\165"
@@ -4844,17 +5480,17 @@ static const NSSItem nss_builtins_items_
 "\234\066\303\046\342\021\366\147\111\035\222\253\214\373\353\377"
 "\172\356\205\112\247\120\200\360\247\134\112\224\056\137\005\231"
 "\074\122\101\340\315\264\143\317\001\103\272\234\203\334\217\140"
 "\073\363\132\264\264\173\256\332\013\220\070\165\357\201\035\146"
 "\322\367\127\160\066\263\277\374\050\257\161\045\205\133\023\376"
 "\036\177\132\264\074"
 , (PRUint32)1173 }
 };
-static const NSSItem nss_builtins_items_67 [] = {
+static const NSSItem nss_builtins_items_77 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Entrust Root Certification Authority", (PRUint32)37 },
   { (void *)"\263\036\261\267\100\343\154\204\002\332\334\067\324\115\365\324"
 "\147\111\122\371"
 , (PRUint32)20 },
@@ -4875,17 +5511,295 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)179 },
   { (void *)"\002\004\105\153\120\124"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_68 [] = {
+static const NSSItem nss_builtins_items_78 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AOL Time Warner Root Certification Authority 1", (PRUint32)47 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\061"
+, (PRUint32)134 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\061"
+, (PRUint32)134 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)"\060\202\003\346\060\202\002\316\240\003\002\001\002\002\001\001"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151"
+"\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034"
+"\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141"
+"\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065"
+"\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040"
+"\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164"
+"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
+"\151\164\171\040\061\060\036\027\015\060\062\060\065\062\071\060"
+"\066\060\060\060\060\132\027\015\063\067\061\061\062\060\061\065"
+"\060\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024"
+"\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040"
+"\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101"
+"\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156"
+"\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114"
+"\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157"
+"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\040\061\060\202\001\042\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
+"\001\017\000\060\202\001\012\002\202\001\001\000\231\336\217\303"
+"\045\243\151\064\350\005\367\164\271\277\132\227\031\271\057\224"
+"\322\223\345\055\211\312\204\174\077\020\103\033\214\213\174\204"
+"\130\370\044\174\110\317\052\375\300\025\331\030\176\204\032\027"
+"\323\333\236\327\312\344\331\327\252\130\121\207\360\360\213\110"
+"\116\342\302\304\131\151\060\142\266\060\242\214\013\021\231\141"
+"\065\155\176\357\305\261\031\006\040\022\216\102\341\337\017\226"
+"\020\122\250\317\234\137\225\024\330\257\073\165\013\061\040\037"
+"\104\057\242\142\101\263\273\030\041\333\312\161\074\214\354\266"
+"\271\015\237\357\121\357\115\173\022\362\013\014\341\254\100\217"
+"\167\177\260\312\170\161\014\135\026\161\160\242\327\302\072\205"
+"\315\016\232\304\340\000\260\325\045\352\334\053\344\224\055\070"
+"\234\211\101\127\144\050\145\031\034\266\104\264\310\061\153\216"
+"\001\173\166\131\045\177\025\034\204\010\174\163\145\040\012\241"
+"\004\056\032\062\250\232\040\261\234\054\041\131\347\373\317\356"
+"\160\055\010\312\143\076\054\233\223\031\152\244\302\227\377\267"
+"\206\127\210\205\154\236\025\026\053\115\054\263\002\003\001\000"
+"\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004"
+"\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004"
+"\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310\330"
+"\075\174\276\137\022\060\037\006\003\125\035\043\004\030\060\026"
+"\200\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310"
+"\330\075\174\276\137\022\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015"
+"\001\001\005\005\000\003\202\001\001\000\212\040\030\245\276\263"
+"\057\264\246\204\000\100\060\051\372\264\024\163\114\171\105\247"
+"\366\160\340\350\176\144\036\012\225\174\152\141\302\357\116\037"
+"\276\377\311\231\037\007\141\112\341\135\114\315\255\356\320\122"
+"\062\331\131\062\274\332\171\162\326\173\011\350\002\201\065\323"
+"\012\337\021\035\311\171\240\200\115\376\132\327\126\326\355\017"
+"\052\257\247\030\165\063\014\352\301\141\005\117\152\232\211\362"
+"\215\271\237\056\357\260\137\132\000\353\276\255\240\370\104\005"
+"\147\274\313\004\357\236\144\305\351\310\077\005\277\306\057\007"
+"\034\303\066\161\206\312\070\146\112\315\326\270\113\306\154\247"
+"\227\073\372\023\055\156\043\141\207\241\143\102\254\302\313\227"
+"\237\141\150\317\055\114\004\235\327\045\117\012\016\115\220\213"
+"\030\126\250\223\110\127\334\157\256\275\236\147\127\167\211\120"
+"\263\276\021\233\105\147\203\206\031\207\323\230\275\010\032\026"
+"\037\130\202\013\341\226\151\005\113\216\354\203\121\061\007\325"
+"\324\237\377\131\173\250\156\205\317\323\113\251\111\260\137\260"
+"\071\050\150\016\163\335\045\232\336\022"
+, (PRUint32)1002 }
+};
+static const NSSItem nss_builtins_items_79 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AOL Time Warner Root Certification Authority 1", (PRUint32)47 },
+  { (void *)"\164\124\123\134\044\243\247\130\040\176\076\076\323\044\370\026"
+"\373\041\026\111"
+, (PRUint32)20 },
+  { (void *)"\347\172\334\261\037\156\006\037\164\154\131\026\047\303\113\300"
+, (PRUint32)16 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\061"
+, (PRUint32)134 },
+  { (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_80 [] = {
+  { (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 *)"AOL Time Warner Root Certification Authority 2", (PRUint32)47 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\062"
+, (PRUint32)134 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\062"
+, (PRUint32)134 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)"\060\202\005\346\060\202\003\316\240\003\002\001\002\002\001\001"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151"
+"\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034"
+"\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141"
+"\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065"
+"\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040"
+"\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164"
+"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
+"\151\164\171\040\062\060\036\027\015\060\062\060\065\062\071\060"
+"\066\060\060\060\060\132\027\015\063\067\060\071\062\070\062\063"
+"\064\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024"
+"\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040"
+"\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101"
+"\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156"
+"\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114"
+"\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157"
+"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\040\062\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\264\067\132\010"
+"\026\231\024\350\125\261\033\044\153\374\307\213\346\207\251\211"
+"\356\213\231\315\117\100\206\244\266\115\311\331\261\334\074\115"
+"\015\205\114\025\154\106\213\122\170\237\370\043\375\147\365\044"
+"\072\150\135\320\367\144\141\101\124\243\213\245\010\322\051\133"
+"\233\140\117\046\203\321\143\022\126\111\166\244\026\302\245\235"
+"\105\254\213\204\225\250\026\261\354\237\352\044\032\357\271\127"
+"\134\232\044\041\054\115\016\161\037\246\254\135\105\164\003\230"
+"\304\124\214\026\112\101\167\206\225\165\014\107\001\146\140\374"
+"\025\361\017\352\365\024\170\307\016\327\156\201\034\136\277\136"
+"\347\072\052\330\227\027\060\174\000\255\010\235\063\257\270\231"
+"\141\200\213\250\225\176\024\334\022\154\244\320\330\357\100\111"
+"\002\066\371\156\251\326\035\226\126\004\262\263\055\026\126\206"
+"\217\331\040\127\200\315\147\020\155\260\114\360\332\106\266\352"
+"\045\056\106\257\215\260\205\070\064\213\024\046\202\053\254\256"
+"\231\013\216\024\327\122\275\236\151\303\206\002\013\352\166\165"
+"\061\011\316\063\031\041\205\103\346\211\055\237\045\067\147\361"
+"\043\152\322\000\155\227\371\237\347\051\312\335\037\327\006\352"
+"\270\311\271\011\041\237\310\077\006\305\322\351\022\106\000\116"
+"\173\010\353\102\075\053\110\156\235\147\335\113\002\344\104\363"
+"\223\031\245\047\316\151\172\276\147\323\374\120\244\054\253\303"
+"\153\271\343\200\114\317\005\141\113\053\334\033\271\246\322\320"
+"\252\365\053\163\373\316\220\065\237\014\122\034\277\134\041\141"
+"\021\133\025\113\251\044\121\374\244\134\367\027\235\260\322\372"
+"\007\351\217\126\344\032\214\150\212\004\323\174\132\343\236\242"
+"\241\312\161\133\242\324\240\347\051\205\135\003\150\052\117\322"
+"\006\327\075\371\303\003\057\077\145\371\147\036\107\100\323\143"
+"\017\343\325\216\371\205\253\227\114\263\327\046\353\226\012\224"
+"\336\205\066\234\310\177\201\011\002\111\052\016\365\144\062\014"
+"\202\321\272\152\202\033\263\113\164\021\363\214\167\326\237\277"
+"\334\067\244\247\125\004\057\324\061\350\323\106\271\003\174\332"
+"\022\116\131\144\267\121\061\061\120\240\312\034\047\331\020\056"
+"\255\326\275\020\146\053\303\260\042\112\022\133\002\003\001\000"
+"\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004"
+"\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004"
+"\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116\325"
+"\277\251\304\040\050\060\037\006\003\125\035\043\004\030\060\026"
+"\200\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116"
+"\325\277\251\304\040\050\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015"
+"\001\001\005\005\000\003\202\002\001\000\073\363\256\312\350\056"
+"\207\205\373\145\131\347\255\021\024\245\127\274\130\237\044\022"
+"\127\273\373\077\064\332\356\255\172\052\064\162\160\061\153\307"
+"\031\230\200\311\202\336\067\167\136\124\213\216\362\352\147\117"
+"\311\164\204\221\126\011\325\345\172\232\201\266\201\302\255\066"
+"\344\361\124\021\123\363\064\105\001\046\310\345\032\274\064\104"
+"\041\336\255\045\374\166\026\167\041\220\200\230\127\235\116\352"
+"\354\057\252\074\024\173\127\301\176\030\024\147\356\044\306\275"
+"\272\025\260\322\030\275\267\125\201\254\123\300\350\335\151\022"
+"\023\102\267\002\265\005\101\312\171\120\156\202\016\161\162\223"
+"\106\350\235\015\135\275\256\316\051\255\143\325\125\026\200\060"
+"\047\377\166\272\367\270\326\112\343\331\265\371\122\320\116\100"
+"\251\307\345\302\062\307\252\166\044\341\153\005\120\353\305\277"
+"\012\124\345\271\102\074\044\373\267\007\234\060\237\171\132\346"
+"\340\100\122\025\364\374\252\364\126\371\104\227\207\355\016\145"
+"\162\136\276\046\373\115\244\055\010\007\336\330\134\240\334\201"
+"\063\231\030\045\021\167\247\353\375\130\011\054\231\153\033\212"
+"\363\122\077\032\115\110\140\361\240\366\063\002\123\213\355\045"
+"\011\270\015\055\355\227\163\354\327\226\037\216\140\016\332\020"
+"\233\057\030\044\366\246\115\012\371\073\313\165\302\314\057\316"
+"\044\151\311\012\042\216\131\247\367\202\014\327\327\153\065\234"
+"\103\000\152\304\225\147\272\234\105\313\270\016\067\367\334\116"
+"\001\117\276\012\266\003\323\255\212\105\367\332\047\115\051\261"
+"\110\337\344\021\344\226\106\275\154\002\076\326\121\310\225\027"
+"\001\025\251\362\252\252\362\277\057\145\033\157\320\271\032\223"
+"\365\216\065\304\200\207\076\224\057\146\344\351\250\377\101\234"
+"\160\052\117\052\071\030\225\036\176\373\141\001\074\121\010\056"
+"\050\030\244\026\017\061\375\072\154\043\223\040\166\341\375\007"
+"\205\321\133\077\322\034\163\062\335\372\271\370\214\317\002\207"
+"\172\232\226\344\355\117\211\215\123\103\253\016\023\300\001\025"
+"\264\171\070\333\374\156\075\236\121\266\270\023\213\147\317\371"
+"\174\331\042\035\366\135\305\034\001\057\230\350\172\044\030\274"
+"\204\327\372\334\162\133\367\301\072\150"
+, (PRUint32)1514 }
+};
+static const NSSItem nss_builtins_items_81 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AOL Time Warner Root Certification Authority 2", (PRUint32)47 },
+  { (void *)"\374\041\232\166\021\057\166\301\305\010\203\074\232\057\242\272"
+"\204\254\010\172"
+, (PRUint32)20 },
+  { (void *)"\001\132\231\303\326\117\251\113\074\073\261\243\253\047\114\277"
+, (PRUint32)16 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\062"
+, (PRUint32)134 },
+  { (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_82 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"RSA Security 2048 v3", (PRUint32)21 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\072\061\031\060\027\006\003\125\004\012\023\020\122\123\101"
 "\040\123\145\143\165\162\151\164\171\040\111\156\143\061\035\060"
@@ -4953,17 +5867,17 @@ static const NSSItem nss_builtins_items_
 "\022\000\360\137\254\015\341\254\160\143\163\367\177\171\237\062"
 "\045\102\164\005\200\050\277\275\301\044\226\130\025\261\027\041"
 "\351\211\113\333\007\210\147\364\025\255\160\076\057\115\205\073"
 "\302\267\333\376\230\150\043\211\341\164\017\336\364\305\204\143"
 "\051\033\314\313\007\311\000\244\251\327\302\042\117\147\327\167"
 "\354\040\005\141\336"
 , (PRUint32)869 }
 };
-static const NSSItem nss_builtins_items_69 [] = {
+static const NSSItem nss_builtins_items_83 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"RSA Security 2048 v3", (PRUint32)21 },
   { (void *)"\045\001\220\031\317\373\331\231\034\267\150\045\164\215\224\137"
 "\060\223\225\102"
 , (PRUint32)20 },
@@ -4977,17 +5891,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000"
 "\000\002"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_70 [] = {
+static const NSSItem nss_builtins_items_84 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GeoTrust Global CA", (PRUint32)19 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\102\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165"
@@ -5055,17 +5969,17 @@ static const NSSItem nss_builtins_items_
 "\207\016\004\154\325\377\335\240\135\355\207\122\267\053\025\002"
 "\256\071\246\152\164\351\332\304\347\274\115\064\036\251\134\115"
 "\063\137\222\011\057\210\146\135\167\227\307\035\166\023\251\325"
 "\345\361\026\011\021\065\325\254\333\044\161\160\054\230\126\013"
 "\331\027\264\321\343\121\053\136\165\350\325\320\334\117\064\355"
 "\302\005\146\200\241\313\346\063"
 , (PRUint32)856 }
 };
-static const NSSItem nss_builtins_items_71 [] = {
+static const NSSItem nss_builtins_items_85 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GeoTrust Global CA", (PRUint32)19 },
   { (void *)"\336\050\364\244\377\345\271\057\243\305\003\321\243\111\247\371"
 "\226\052\202\022"
 , (PRUint32)20 },
@@ -5079,17 +5993,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)68 },
   { (void *)"\002\003\002\064\126"
 , (PRUint32)5 },
   { (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_72 [] = {
+static const NSSItem nss_builtins_items_86 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GeoTrust Global CA 2", (PRUint32)21 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165"
@@ -5158,17 +6072,17 @@ static const NSSItem nss_builtins_items_
 "\136\054\157\025\231\046\347\266\051\377\042\354\311\002\307\126"
 "\000\315\111\271\263\154\173\123\004\032\342\250\311\252\022\005"
 "\043\302\316\347\273\004\002\314\300\107\242\344\304\051\057\133"
 "\105\127\211\121\356\074\353\122\010\377\007\065\036\237\065\152"
 "\107\112\126\230\321\132\205\037\214\365\042\277\253\316\203\363"
 "\342\042\051\256\175\203\100\250\272\154"
 , (PRUint32)874 }
 };
-static const NSSItem nss_builtins_items_73 [] = {
+static const NSSItem nss_builtins_items_87 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GeoTrust Global CA 2", (PRUint32)21 },
   { (void *)"\251\351\170\010\024\067\130\210\362\005\031\260\155\053\015\053"
 "\140\026\220\175"
 , (PRUint32)20 },
@@ -5182,17 +6096,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)70 },
   { (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_74 [] = {
+static const NSSItem nss_builtins_items_88 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GeoTrust Universal CA", (PRUint32)22 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165"
@@ -5293,17 +6207,17 @@ static const NSSItem nss_builtins_items_
 "\014\136\011\154\010\227\174\243\075\174\223\377\077\241\024\247"
 "\317\265\135\353\333\333\034\304\166\337\210\271\275\105\005\225"
 "\033\256\374\106\152\114\257\110\343\316\256\017\322\176\353\346"
 "\154\234\117\201\152\172\144\254\273\076\325\347\313\166\056\305"
 "\247\110\301\134\220\017\313\310\077\372\346\062\341\215\033\157"
 "\244\346\216\330\371\051\110\212\316\163\376\054"
 , (PRUint32)1388 }
 };
-static const NSSItem nss_builtins_items_75 [] = {
+static const NSSItem nss_builtins_items_89 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GeoTrust Universal CA", (PRUint32)22 },
   { (void *)"\346\041\363\065\103\171\005\232\113\150\060\235\212\057\164\042"
 "\025\207\354\171"
 , (PRUint32)20 },
@@ -5317,17 +6231,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)71 },
   { (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_76 [] = {
+static const NSSItem nss_builtins_items_90 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GeoTrust Universal CA 2", (PRUint32)24 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165"
@@ -5428,17 +6342,17 @@ static const NSSItem nss_builtins_items_
 "\351\242\334\257\176\030\022\203\375\126\027\101\056\325\051\202"
 "\175\231\364\061\366\161\251\317\054\001\047\245\005\271\252\262"
 "\110\116\052\357\237\223\122\121\225\074\122\163\216\126\114\027"
 "\100\300\011\050\344\213\152\110\123\333\354\315\125\125\361\306"
 "\370\351\242\054\114\246\321\046\137\176\257\132\114\332\037\246"
 "\362\034\054\176\256\002\026\322\126\320\057\127\123\107\350\222"
 , (PRUint32)1392 }
 };
-static const NSSItem nss_builtins_items_77 [] = {
+static const NSSItem nss_builtins_items_91 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GeoTrust Universal CA 2", (PRUint32)24 },
   { (void *)"\067\232\031\173\101\205\105\065\014\246\003\151\363\074\056\257"
 "\107\117\040\171"
 , (PRUint32)20 },
@@ -5452,17 +6366,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)73 },
   { (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_78 [] = {
+static const NSSItem nss_builtins_items_92 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"UTN-USER First-Network Applications", (PRUint32)36 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\243\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
@@ -5560,17 +6474,17 @@ static const NSSItem nss_builtins_items_
 "\255\006\264\334\010\243\004\325\051\244\226\232\022\147\112\214"
 "\140\105\235\361\043\232\260\000\234\150\265\230\120\323\357\216"
 "\056\222\145\261\110\076\041\276\025\060\052\015\265\014\243\153"
 "\077\256\177\127\365\037\226\174\337\157\335\202\060\054\145\033"
 "\100\112\315\150\271\162\354\161\166\354\124\216\037\205\014\001"
 "\152\372\246\070\254\037\304\204"
 , (PRUint32)1128 }
 };
-static const NSSItem nss_builtins_items_79 [] = {
+static const NSSItem nss_builtins_items_93 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"UTN-USER First-Network Applications", (PRUint32)36 },
   { (void *)"\135\230\234\333\025\226\021\066\121\145\144\033\126\017\333\352"
 "\052\302\076\361"
 , (PRUint32)20 },
@@ -5591,17 +6505,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300"
 "\063\167"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_80 [] = {
+static const NSSItem nss_builtins_items_94 [] = {
   { (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 *)"America Online Root Certification Authority 1", (PRUint32)46 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\034\060\032\006\003\125\004\012\023\023\101\155\145\162\151\143"
@@ -5678,17 +6592,17 @@ static const NSSItem nss_builtins_items_
 "\335\245\270\062\237\215\340\051\337\041\164\206\202\333\057\202"
 "\060\306\307\065\206\263\371\226\137\106\333\014\105\375\363\120"
 "\303\157\306\303\110\255\106\246\341\047\107\012\035\016\233\266"
 "\302\167\177\143\362\340\175\032\276\374\340\337\327\307\247\154"
 "\260\371\256\272\074\375\164\264\021\350\130\015\200\274\323\250"
 "\200\072\231\355\165\314\106\173"
 , (PRUint32)936 }
 };
-static const NSSItem nss_builtins_items_81 [] = {
+static const NSSItem nss_builtins_items_95 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"America Online Root Certification Authority 1", (PRUint32)46 },
   { (void *)"\071\041\301\025\301\135\016\312\134\313\133\304\360\175\041\330"
 "\005\013\126\152"
 , (PRUint32)20 },
@@ -5704,17 +6618,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)101 },
   { (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_82 [] = {
+static const NSSItem nss_builtins_items_96 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"America Online Root Certification Authority 2", (PRUint32)46 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\034\060\032\006\003\125\004\012\023\023\101\155\145\162\151\143"
@@ -5823,17 +6737,17 @@ static const NSSItem nss_builtins_items_
 "\375\034\215\000\017\270\067\337\147\212\235\146\251\002\152\221"
 "\377\023\312\057\135\203\274\207\223\154\334\044\121\026\004\045"
 "\146\372\263\331\302\272\051\276\232\110\070\202\231\364\277\073"
 "\112\061\031\371\277\216\041\063\024\312\117\124\137\373\316\373"
 "\217\161\177\375\136\031\240\017\113\221\270\304\124\274\006\260"
 "\105\217\046\221\242\216\376\251"
 , (PRUint32)1448 }
 };
-static const NSSItem nss_builtins_items_83 [] = {
+static const NSSItem nss_builtins_items_97 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"America Online Root Certification Authority 2", (PRUint32)46 },
   { (void *)"\205\265\377\147\233\014\171\226\037\310\156\104\042\000\106\023"
 "\333\027\222\204"
 , (PRUint32)20 },
@@ -5849,17 +6763,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)101 },
   { (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_84 [] = {
+static const NSSItem nss_builtins_items_98 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Visa eCommerce Root", (PRUint32)20 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\153\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
@@ -5937,17 +6851,17 @@ static const NSSItem nss_builtins_items_
 "\004\231\040\066\320\140\156\141\006\273\026\102\214\160\367\060"
 "\373\340\333\146\243\000\001\275\346\054\332\221\137\240\106\213"
 "\115\152\234\075\075\335\005\106\376\166\277\240\012\074\344\000"
 "\346\047\267\377\204\055\336\272\042\047\226\020\161\353\042\355"
 "\337\337\063\234\317\343\255\256\216\324\216\346\117\121\257\026"
 "\222\340\134\366\007\017"
 , (PRUint32)934 }
 };
-static const NSSItem nss_builtins_items_85 [] = {
+static const NSSItem nss_builtins_items_99 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Visa eCommerce Root", (PRUint32)20 },
   { (void *)"\160\027\233\206\214\000\244\372\140\221\122\042\077\237\076\062"
 "\275\340\005\142"
 , (PRUint32)20 },
@@ -5964,17 +6878,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\023\206\065\115\035\077\006\362\301\371\145\005\325\220"
 "\034\142"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_86 [] = {
+static const NSSItem nss_builtins_items_100 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TC TrustCenter, Germany, Class 2 CA", (PRUint32)36 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\104\105"
 "\061\020\060\016\006\003\125\004\010\023\007\110\141\155\142\165"
@@ -6056,17 +6970,17 @@ static const NSSItem nss_builtins_items_
 "\214\265\137\172\162\241\205\006\316\206\370\005\216\350\371\045"
 "\312\332\203\214\006\254\353\066\155\205\221\064\004\066\364\102"
 "\360\370\171\056\012\110\134\253\314\121\117\170\166\240\331\254"
 "\031\275\052\321\151\004\050\221\312\066\020\047\200\127\133\322"
 "\134\365\302\133\253\144\201\143\164\121\364\227\277\315\022\050"
 "\367\115\146\177\247\360\034\001\046\170\262\146\107\160\121\144"
 , (PRUint32)864 }
 };
-static const NSSItem nss_builtins_items_87 [] = {
+static const NSSItem nss_builtins_items_101 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TC TrustCenter, Germany, Class 2 CA", (PRUint32)36 },
   { (void *)"\203\216\060\367\177\335\024\252\070\136\321\105\000\234\016\042"
 "\066\111\117\252"
 , (PRUint32)20 },
@@ -6087,17 +7001,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)191 },
   { (void *)"\002\002\003\352"
 , (PRUint32)4 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_88 [] = {
+static const NSSItem nss_builtins_items_102 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TC TrustCenter, Germany, Class 3 CA", (PRUint32)36 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\104\105"
 "\061\020\060\016\006\003\125\004\010\023\007\110\141\155\142\165"
@@ -6179,17 +7093,17 @@ static const NSSItem nss_builtins_items_
 "\115\275\175\001\243\077\366\354\316\361\336\376\175\345\341\076"
 "\273\306\253\136\013\335\075\226\304\313\251\324\371\046\346\006"
 "\116\236\014\245\172\272\156\303\174\202\031\321\307\261\261\303"
 "\333\015\216\233\100\174\067\013\361\135\350\375\037\220\210\245"
 "\016\116\067\144\041\250\116\215\264\237\361\336\110\255\325\126"
 "\030\122\051\213\107\064\022\011\324\273\222\065\357\017\333\064"
 , (PRUint32)864 }
 };
-static const NSSItem nss_builtins_items_89 [] = {
+static const NSSItem nss_builtins_items_103 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TC TrustCenter, Germany, Class 3 CA", (PRUint32)36 },
   { (void *)"\237\307\226\350\370\122\117\206\072\341\111\155\070\022\102\020"
 "\137\033\170\365"
 , (PRUint32)20 },
@@ -6210,17 +7124,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)191 },
   { (void *)"\002\002\003\353"
 , (PRUint32)4 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_90 [] = {
+static const NSSItem nss_builtins_items_104 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Certum Root CA", (PRUint32)15 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\076\061\013\060\011\006\003\125\004\006\023\002\120\114\061"
 "\033\060\031\006\003\125\004\012\023\022\125\156\151\172\145\164"
@@ -6281,17 +7195,17 @@ static const NSSItem nss_builtins_items_
 "\345\114\121\343\001\255\205\135\032\073\261\325\163\020\244\323"
 "\362\274\156\144\365\132\126\220\250\307\016\114\164\017\056\161"
 "\073\367\310\107\364\151\157\025\362\021\136\203\036\234\174\122"
 "\256\375\002\332\022\250\131\147\030\333\274\160\335\233\261\151"
 "\355\200\316\211\100\110\152\016\065\312\051\146\025\041\224\054"
 "\350\140\052\233\205\112\100\363\153\212\044\354\006\026\054\163"
 , (PRUint32)784 }
 };
-static const NSSItem nss_builtins_items_91 [] = {
+static const NSSItem nss_builtins_items_105 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Certum Root CA", (PRUint32)15 },
   { (void *)"\142\122\334\100\367\021\103\242\057\336\236\367\064\216\006\102"
 "\121\261\201\030"
 , (PRUint32)20 },
@@ -6304,17 +7218,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)64 },
   { (void *)"\002\003\001\000\040"
 , (PRUint32)5 },
   { (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_92 [] = {
+static const NSSItem nss_builtins_items_106 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Comodo AAA Services root", (PRUint32)25 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\173\061\013\060\011\006\003\125\004\006\023\002\107\102\061"
 "\033\060\031\006\003\125\004\010\014\022\107\162\145\141\164\145"
@@ -6402,17 +7316,17 @@ static const NSSItem nss_builtins_items_
 "\372\272\002\316\247\054\251\020\023\054\324\345\010\046\253\042"
 "\227\140\370\220\136\164\324\242\232\123\275\362\251\150\340\242"
 "\156\302\327\154\261\243\017\236\277\353\150\347\126\362\256\362"
 "\343\053\070\072\011\201\265\153\205\327\276\055\355\077\032\267"
 "\262\143\342\365\142\054\202\324\152\000\101\120\361\071\203\237"
 "\225\351\066\226\230\156"
 , (PRUint32)1078 }
 };
-static const NSSItem nss_builtins_items_93 [] = {
+static const NSSItem nss_builtins_items_107 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Comodo AAA Services root", (PRUint32)25 },
   { (void *)"\321\353\043\244\155\027\326\217\331\045\144\302\361\361\140\027"
 "\144\330\343\111"
 , (PRUint32)20 },
@@ -6429,17 +7343,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)125 },
   { (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_94 [] = {
+static const NSSItem nss_builtins_items_108 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Comodo Secure Services root", (PRUint32)28 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\176\061\013\060\011\006\003\125\004\006\023\002\107\102\061"
 "\033\060\031\006\003\125\004\010\014\022\107\162\145\141\164\145"
@@ -6528,17 +7442,17 @@ static const NSSItem nss_builtins_items_
 "\150\076\265\046\127\356\266\340\266\335\271\051\200\171\175\217"
 "\243\360\244\050\244\025\304\205\364\047\324\153\277\345\134\344"
 "\145\002\166\124\264\343\067\146\044\323\031\141\310\122\020\345"
 "\213\067\232\271\251\371\035\277\352\231\222\141\226\377\001\315"
 "\241\137\015\274\161\274\016\254\013\035\107\105\035\301\354\174"
 "\354\375\051"
 , (PRUint32)1091 }
 };
-static const NSSItem nss_builtins_items_95 [] = {
+static const NSSItem nss_builtins_items_109 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Comodo Secure Services root", (PRUint32)28 },
   { (void *)"\112\145\325\364\035\357\071\270\270\220\112\112\323\144\201\063"
 "\317\307\241\321"
 , (PRUint32)20 },
@@ -6555,17 +7469,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)128 },
   { (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_96 [] = {
+static const NSSItem nss_builtins_items_110 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Comodo Trusted Services root", (PRUint32)29 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\177\061\013\060\011\006\003\125\004\006\023\002\107\102\061"
 "\033\060\031\006\003\125\004\010\014\022\107\162\145\141\164\145"
@@ -6656,17 +7570,17 @@ static const NSSItem nss_builtins_items_
 "\306\241\161\354\077\240\040\214\146\072\211\264\216\324\330\261"
 "\115\045\107\356\057\210\310\265\341\005\105\300\276\024\161\336"
 "\172\375\216\173\175\115\010\226\245\022\163\360\055\312\067\047"
 "\164\022\047\114\313\266\227\351\331\256\010\155\132\071\100\335"
 "\005\107\165\152\132\041\263\243\030\317\116\367\056\127\267\230"
 "\160\136\310\304\170\260\142"
 , (PRUint32)1095 }
 };
-static const NSSItem nss_builtins_items_97 [] = {
+static const NSSItem nss_builtins_items_111 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Comodo Trusted Services root", (PRUint32)29 },
   { (void *)"\341\237\343\016\213\204\140\236\200\233\027\015\162\250\305\272"
 "\156\024\011\275"
 , (PRUint32)20 },
@@ -6684,17 +7598,1312 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)129 },
   { (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_98 [] = {
+static const NSSItem nss_builtins_items_112 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS Chained CAs root", (PRUint32)21 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
+"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
+"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
+"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
+"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
+"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
+, (PRUint32)288 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
+"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
+"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
+"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
+"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
+"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
+, (PRUint32)288 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052"
+"\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103"
+"\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
+"\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003"
+"\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151"
+"\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
+"\036\027\015\060\061\061\062\062\071\060\060\065\063\065\070\132"
+"\027\015\062\065\061\062\062\067\060\060\065\063\065\070\132\060"
+"\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052"
+"\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103"
+"\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
+"\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003"
+"\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151"
+"\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
+"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
+"\000\003\201\215\000\060\201\211\002\201\201\000\334\126\222\111"
+"\262\224\040\274\230\117\120\353\150\244\247\111\013\277\322\061"
+"\350\307\117\302\206\013\372\150\375\103\132\212\363\140\222\065"
+"\231\070\273\115\003\122\041\133\360\067\231\065\341\101\040\201"
+"\205\201\005\161\201\235\264\225\031\251\137\166\064\056\143\067"
+"\065\127\216\264\037\102\077\025\134\341\172\301\137\023\030\062"
+"\061\311\255\276\243\307\203\146\036\271\234\004\023\313\151\301"
+"\006\336\060\006\273\063\243\265\037\360\217\157\316\377\226\350"
+"\124\276\146\200\256\153\333\101\204\066\242\075\002\003\001\000"
+"\001\243\202\004\103\060\202\004\077\060\035\006\003\125\035\016"
+"\004\026\004\024\241\255\061\261\371\076\341\027\246\310\253\064"
+"\374\122\207\011\036\142\122\101\060\202\001\116\006\003\125\035"
+"\043\004\202\001\105\060\202\001\101\200\024\241\255\061\261\371"
+"\076\341\027\246\310\253\064\374\122\207\011\036\142\122\101\241"
+"\202\001\044\244\202\001\040\060\202\001\034\061\013\060\011\006"
+"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
+"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
+"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
+"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
+"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
+"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
+"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
+"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\063\060"
+"\061\006\003\125\004\013\023\052\111\120\123\040\103\101\040\103"
+"\150\141\151\156\145\144\040\103\101\163\040\103\145\162\164\151"
+"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
+"\164\171\061\063\060\061\006\003\125\004\003\023\052\111\120\123"
+"\040\103\101\040\103\150\141\151\156\145\144\040\103\101\163\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
+"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
+"\056\151\160\163\056\145\163\202\001\000\060\014\006\003\125\035"
+"\023\004\005\060\003\001\001\377\060\014\006\003\125\035\017\004"
+"\005\003\003\007\377\200\060\153\006\003\125\035\045\004\144\060"
+"\142\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\006\010\053\006\001\005\005\007\003\003\006"
+"\010\053\006\001\005\005\007\003\004\006\010\053\006\001\005\005"
+"\007\003\010\006\012\053\006\001\004\001\202\067\002\001\025\006"
+"\012\053\006\001\004\001\202\067\002\001\026\006\012\053\006\001"
+"\004\001\202\067\012\003\001\006\012\053\006\001\004\001\202\067"
+"\012\003\004\060\021\006\011\140\206\110\001\206\370\102\001\001"
+"\004\004\003\002\000\007\060\032\006\003\125\035\021\004\023\060"
+"\021\201\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\060\032\006\003\125\035\022\004\023\060\021\201\017\151"
+"\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060\102"
+"\006\011\140\206\110\001\206\370\102\001\015\004\065\026\063\103"
+"\150\141\151\156\145\144\040\103\101\040\103\145\162\164\151\146"
+"\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171\040"
+"\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145"
+"\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002\004"
+"\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151\160"
+"\163\056\145\163\057\151\160\163\062\060\060\062\057\060\067\006"
+"\011\140\206\110\001\206\370\102\001\004\004\052\026\050\150\164"
+"\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057"
+"\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062\103"
+"\101\103\056\143\162\154\060\074\006\011\140\206\110\001\206\370"
+"\102\001\003\004\057\026\055\150\164\164\160\072\057\057\167\167"
+"\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062"
+"\057\162\145\166\157\143\141\164\151\157\156\103\101\103\056\150"
+"\164\155\154\077\060\071\006\011\140\206\110\001\206\370\102\001"
+"\007\004\054\026\052\150\164\164\160\072\057\057\167\167\167\056"
+"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
+"\145\156\145\167\141\154\103\101\103\056\150\164\155\154\077\060"
+"\067\006\011\140\206\110\001\206\370\102\001\010\004\052\026\050"
+"\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145"
+"\163\057\151\160\163\062\060\060\062\057\160\157\154\151\143\171"
+"\103\101\103\056\150\164\155\154\060\155\006\003\125\035\037\004"
+"\146\060\144\060\056\240\054\240\052\206\050\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\151\160\163\062\060\060\062\103\101\103\056"
+"\143\162\154\060\062\240\060\240\056\206\054\150\164\164\160\072"
+"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
+"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
+"\103\101\103\056\143\162\154\060\057\006\010\053\006\001\005\005"
+"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
+"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
+"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
+"\367\015\001\001\005\005\000\003\201\201\000\104\162\060\235\126"
+"\130\242\101\033\050\267\225\341\246\032\225\137\247\170\100\053"
+"\357\333\226\112\374\114\161\143\331\163\225\275\002\342\242\006"
+"\307\276\227\052\223\200\064\206\003\372\334\330\075\036\007\315"
+"\036\163\103\044\140\365\035\141\334\334\226\240\274\373\035\343"
+"\347\022\000\047\063\002\300\300\053\123\075\330\153\003\201\243"
+"\333\326\223\225\040\357\323\226\176\046\220\211\234\046\233\315"
+"\157\146\253\355\003\042\104\070\314\131\275\237\333\366\007\242"
+"\001\177\046\304\143\365\045\102\136\142\275"
+, (PRUint32)2043 }
+};
+static const NSSItem nss_builtins_items_113 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS Chained CAs root", (PRUint32)21 },
+  { (void *)"\310\302\137\026\236\370\120\164\325\276\350\315\242\324\074\256"
+"\347\137\322\127"
+, (PRUint32)20 },
+  { (void *)"\215\162\121\333\240\072\317\040\167\337\362\145\006\136\337\357"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
+"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
+"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
+"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
+"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
+"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
+, (PRUint32)288 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_114 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASE1 root", (PRUint32)16 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045"
+"\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145"
+"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
+"\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045"
+"\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145"
+"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
+"\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367"
+"\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151"
+"\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060"
+"\060\065\071\063\070\132\027\015\062\065\061\062\062\067\060\060"
+"\065\071\063\070\132\060\202\001\022\061\013\060\011\006\003\125"
+"\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023"
+"\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003"
+"\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056"
+"\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164"
+"\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147"
+"\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053"
+"\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040"
+"\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006"
+"\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101"
+"\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006"
+"\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101"
+"\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006"
+"\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100"
+"\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
+"\000\060\201\211\002\201\201\000\340\121\047\247\013\335\257\321"
+"\271\103\133\202\067\105\126\162\357\232\266\302\022\357\054\022"
+"\314\166\371\006\131\257\135\041\324\322\132\270\240\324\363\152"
+"\375\312\151\215\146\110\367\164\346\356\066\275\350\226\221\165"
+"\246\161\050\312\347\042\022\062\151\260\076\036\153\364\120\122"
+"\142\142\375\143\073\175\176\354\356\070\352\142\364\154\250\161"
+"\215\341\351\213\311\077\306\265\315\224\102\157\335\202\105\074"
+"\350\337\011\350\357\012\125\251\126\107\141\114\111\144\163\020"
+"\050\077\312\277\011\377\306\057\002\003\001\000\001\243\202\004"
+"\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024"
+"\353\263\031\171\363\301\245\034\254\334\272\037\146\242\262\233"
+"\151\320\170\010\060\202\001\104\006\003\125\035\043\004\202\001"
+"\073\060\202\001\067\200\024\353\263\031\171\363\301\245\034\254"
+"\334\272\037\146\242\262\233\151\320\170\010\241\202\001\032\244"
+"\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006"
+"\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102"
+"\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004"
+"\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054"
+"\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162"
+"\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123"
+"\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051"
+"\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102"
+"\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125"
+"\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
+"\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125"
+"\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
+"\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052"
+"\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141"
+"\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003"
+"\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035"
+"\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004"
+"\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053"
+"\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003"
+"\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001"
+"\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001"
+"\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053"
+"\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001"
+"\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102"
+"\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004"
+"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
+"\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201"
+"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
+"\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026"
+"\062\103\114\101\123\105\061\040\103\101\040\103\145\162\164\151"
+"\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171"
+"\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056"
+"\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002"
+"\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151"
+"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072"
+"\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150"
+"\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163"
+"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
+"\103\114\101\123\105\061\056\143\162\154\060\077\006\011\140\206"
+"\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103"
+"\114\101\123\105\061\056\150\164\155\154\077\060\074\006\011\140"
+"\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160"
+"\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160"
+"\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101"
+"\123\105\061\056\150\164\155\154\077\060\072\006\011\140\206\110"
+"\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057"
+"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
+"\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\061"
+"\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152"
+"\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167"
+"\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060"
+"\062\057\151\160\163\062\060\060\062\103\114\101\123\105\061\056"
+"\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072"
+"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
+"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
+"\103\114\101\123\105\061\056\143\162\154\060\057\006\010\053\006"
+"\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006"
+"\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157"
+"\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052"
+"\206\110\206\367\015\001\001\005\005\000\003\201\201\000\053\320"
+"\353\375\332\310\312\131\152\332\323\314\062\056\311\124\033\212"
+"\142\176\025\055\351\331\061\323\056\364\047\043\377\133\253\305"
+"\112\266\162\100\256\123\164\364\274\005\264\306\331\310\311\167"
+"\373\267\371\064\177\170\000\370\326\244\344\122\077\054\112\143"
+"\127\201\165\132\216\350\214\373\002\300\224\306\051\272\263\334"
+"\034\350\262\257\322\056\142\133\032\251\216\016\314\305\127\105"
+"\121\024\351\116\034\210\245\221\364\243\367\216\121\310\251\276"
+"\206\063\076\346\057\110\156\257\124\220\116\255\261\045"
+, (PRUint32)2030 }
+};
+static const NSSItem nss_builtins_items_115 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASE1 root", (PRUint32)16 },
+  { (void *)"\103\236\122\137\132\152\107\303\054\353\304\134\143\355\071\061"
+"\174\345\364\337"
+, (PRUint32)20 },
+  { (void *)"\204\220\035\225\060\111\126\374\101\201\360\105\327\166\304\153"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_116 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASE3 root", (PRUint32)16 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045"
+"\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145"
+"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
+"\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045"
+"\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145"
+"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
+"\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367"
+"\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151"
+"\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060"
+"\061\060\061\064\064\132\027\015\062\065\061\062\062\067\060\061"
+"\060\061\064\064\132\060\202\001\022\061\013\060\011\006\003\125"
+"\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023"
+"\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003"
+"\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056"
+"\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164"
+"\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147"
+"\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053"
+"\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040"
+"\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006"
+"\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101"
+"\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006"
+"\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101"
+"\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006"
+"\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100"
+"\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
+"\000\060\201\211\002\201\201\000\253\027\376\016\260\306\150\033"
+"\123\360\122\276\237\372\332\372\213\023\004\273\001\217\062\331"
+"\037\217\115\316\066\230\332\344\000\104\214\050\330\023\104\052"
+"\244\153\116\027\044\102\234\323\210\244\101\202\326\043\373\213"
+"\311\206\345\271\251\202\005\334\361\336\037\340\014\231\125\230"
+"\362\070\354\154\235\040\003\300\357\252\243\306\144\004\121\055"
+"\170\015\243\322\250\072\326\044\114\351\226\172\030\254\023\043"
+"\042\033\174\350\061\021\263\137\011\252\060\160\161\106\045\153"
+"\111\161\200\053\225\001\262\037\002\003\001\000\001\243\202\004"
+"\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024"
+"\270\223\377\056\313\334\054\216\242\347\172\376\066\121\041\243"
+"\230\133\014\064\060\202\001\104\006\003\125\035\043\004\202\001"
+"\073\060\202\001\067\200\024\270\223\377\056\313\334\054\216\242"
+"\347\172\376\066\121\041\243\230\133\014\064\241\202\001\032\244"
+"\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006"
+"\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102"
+"\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004"
+"\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054"
+"\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162"
+"\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123"
+"\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051"
+"\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102"
+"\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125"
+"\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
+"\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125"
+"\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
+"\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052"
+"\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141"
+"\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003"
+"\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035"
+"\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004"
+"\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053"
+"\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003"
+"\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001"
+"\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001"
+"\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053"
+"\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001"
+"\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102"
+"\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004"
+"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
+"\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201"
+"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
+"\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026"
+"\062\103\114\101\123\105\063\040\103\101\040\103\145\162\164\151"
+"\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171"
+"\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056"
+"\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002"
+"\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151"
+"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072"
+"\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150"
+"\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163"
+"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
+"\103\114\101\123\105\063\056\143\162\154\060\077\006\011\140\206"
+"\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103"
+"\114\101\123\105\063\056\150\164\155\154\077\060\074\006\011\140"
+"\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160"
+"\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160"
+"\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101"
+"\123\105\063\056\150\164\155\154\077\060\072\006\011\140\206\110"
+"\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057"
+"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
+"\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\063"
+"\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152"
+"\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167"
+"\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060"
+"\062\057\151\160\163\062\060\060\062\103\114\101\123\105\063\056"
+"\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072"
+"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
+"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
+"\103\114\101\123\105\063\056\143\162\154\060\057\006\010\053\006"
+"\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006"
+"\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157"
+"\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052"
+"\206\110\206\367\015\001\001\005\005\000\003\201\201\000\027\145"
+"\134\231\225\103\003\047\257\046\345\353\320\263\027\043\367\103"
+"\252\307\360\175\354\017\306\251\256\256\226\017\166\051\034\342"
+"\006\055\176\046\305\074\372\241\301\201\316\123\260\102\321\227"
+"\127\032\027\176\244\121\141\306\356\351\136\357\005\272\353\275"
+"\017\247\222\157\330\243\006\150\051\216\171\365\377\277\371\247"
+"\257\344\261\316\302\321\200\102\047\005\004\064\370\303\177\026"
+"\170\043\014\007\044\362\106\107\255\073\124\320\257\325\061\262"
+"\257\175\310\352\351\324\126\331\016\023\262\305\105\120"
+, (PRUint32)2030 }
+};
+static const NSSItem nss_builtins_items_117 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASE3 root", (PRUint32)16 },
+  { (void *)"\101\170\253\114\277\316\173\101\002\254\332\304\223\076\157\365"
+"\015\317\161\134"
+, (PRUint32)20 },
+  { (void *)"\102\166\227\150\317\246\264\070\044\252\241\033\362\147\336\312"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_118 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASEA1 root", (PRUint32)17 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046"
+"\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
+"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
+"\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062"
+"\071\060\061\060\065\063\062\132\027\015\062\065\061\062\062\067"
+"\060\061\060\065\063\062\132\060\202\001\024\061\013\060\011\006"
+"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
+"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
+"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
+"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
+"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
+"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
+"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
+"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
+"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
+"\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
+"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
+"\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
+"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
+"\000\003\201\215\000\060\201\211\002\201\201\000\273\060\327\334"
+"\320\124\275\065\116\237\305\114\202\352\321\120\074\107\230\374"
+"\233\151\235\167\315\156\340\077\356\353\062\137\137\237\322\320"
+"\171\345\225\163\104\041\062\340\012\333\235\327\316\215\253\122"
+"\213\053\170\340\233\133\175\364\375\155\011\345\256\341\154\035"
+"\007\043\240\027\321\371\175\250\106\106\221\042\250\262\151\306"
+"\255\367\365\365\224\241\060\224\275\000\314\104\177\356\304\236"
+"\311\301\346\217\012\066\301\375\044\075\001\240\365\173\342\174"
+"\170\146\103\213\117\131\362\233\331\372\111\263\002\003\001\000"
+"\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016"
+"\004\026\004\024\147\046\226\347\241\277\330\265\003\235\376\073"
+"\334\376\362\212\346\025\335\060\060\202\001\106\006\003\125\035"
+"\043\004\202\001\075\060\202\001\071\200\024\147\046\226\347\241"
+"\277\330\265\003\235\376\073\334\376\362\212\346\025\335\060\241"
+"\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006"
+"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
+"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
+"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
+"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
+"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
+"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
+"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
+"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
+"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
+"\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
+"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
+"\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202"
+"\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377"
+"\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153"
+"\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005"
+"\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053"
+"\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003"
+"\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001"
+"\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067"
+"\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006"
+"\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140"
+"\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032"
+"\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035"
+"\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370"
+"\102\001\015\004\065\026\063\103\114\101\123\105\101\061\040\103"
+"\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163"
+"\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167"
+"\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206"
+"\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102"
+"\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167"
+"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
+"\151\160\163\062\060\060\062\103\114\101\123\105\101\061\056\143"
+"\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004"
+"\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160"
+"\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166"
+"\157\143\141\164\151\157\156\103\114\101\123\105\101\061\056\150"
+"\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001"
+"\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056"
+"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
+"\145\156\145\167\141\154\103\114\101\123\105\101\061\056\150\164"
+"\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010"
+"\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151"
+"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157"
+"\154\151\143\171\103\114\101\123\105\101\061\056\150\164\155\154"
+"\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240"
+"\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160"
+"\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163"
+"\062\060\060\062\103\114\101\123\105\101\061\056\143\162\154\060"
+"\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167"
+"\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123"
+"\105\101\061\056\143\162\154\060\057\006\010\053\006\001\005\005"
+"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
+"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
+"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
+"\367\015\001\001\005\005\000\003\201\201\000\176\272\212\254\200"
+"\000\204\025\012\325\230\121\014\144\305\234\002\130\203\146\312"
+"\255\036\007\315\176\152\332\200\007\337\003\064\112\034\223\304"
+"\113\130\040\065\066\161\355\242\012\065\022\245\246\145\247\205"
+"\151\012\016\343\141\356\352\276\050\223\063\325\354\350\276\304"
+"\333\137\177\250\371\143\061\310\153\226\342\051\302\133\240\347"
+"\227\066\235\167\136\061\153\376\323\247\333\052\333\333\226\213"
+"\037\146\336\266\003\300\053\263\170\326\125\007\345\217\071\120"
+"\336\007\043\162\346\275\040\024\113\264\206"
+, (PRUint32)2043 }
+};
+static const NSSItem nss_builtins_items_119 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASEA1 root", (PRUint32)17 },
+  { (void *)"\063\243\065\302\074\350\003\113\004\341\075\345\304\216\171\032"
+"\353\214\062\004"
+, (PRUint32)20 },
+  { (void *)"\014\370\236\027\374\324\003\275\346\215\233\074\005\207\376\204"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_120 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASEA3 root", (PRUint32)17 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046"
+"\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
+"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
+"\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062"
+"\071\060\061\060\067\065\060\132\027\015\062\065\061\062\062\067"
+"\060\061\060\067\065\060\132\060\202\001\024\061\013\060\011\006"
+"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
+"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
+"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
+"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
+"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
+"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
+"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
+"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
+"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
+"\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
+"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
+"\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
+"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
+"\000\003\201\215\000\060\201\211\002\201\201\000\356\200\000\366"
+"\032\144\056\255\152\310\203\261\213\247\356\217\331\266\333\315"
+"\033\273\206\006\042\166\063\014\022\155\110\126\141\322\334\202"
+"\045\142\057\237\322\151\060\145\003\102\043\130\274\107\334\153"
+"\326\165\135\027\074\341\377\362\130\147\171\240\301\201\261\324"
+"\126\242\362\215\021\231\375\366\175\361\307\304\136\002\052\232"
+"\342\112\265\023\212\000\375\214\167\206\346\327\224\365\040\165"
+"\056\016\114\277\164\304\077\201\076\203\264\243\070\066\051\347"
+"\350\052\365\214\210\101\252\200\246\343\154\357\002\003\001\000"
+"\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016"
+"\004\026\004\024\036\237\127\120\107\266\141\223\071\323\054\374"
+"\332\135\075\005\165\267\231\002\060\202\001\106\006\003\125\035"
+"\043\004\202\001\075\060\202\001\071\200\024\036\237\127\120\107"
+"\266\141\223\071\323\054\374\332\135\075\005\165\267\231\002\241"
+"\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006"
+"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
+"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
+"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
+"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
+"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
+"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
+"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
+"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
+"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
+"\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
+"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
+"\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202"
+"\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377"
+"\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153"
+"\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005"
+"\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053"
+"\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003"
+"\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001"
+"\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067"
+"\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006"
+"\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140"
+"\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032"
+"\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035"
+"\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370"
+"\102\001\015\004\065\026\063\103\114\101\123\105\101\063\040\103"
+"\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163"
+"\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167"
+"\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206"
+"\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102"
+"\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167"
+"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
+"\151\160\163\062\060\060\062\103\114\101\123\105\101\063\056\143"
+"\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004"
+"\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160"
+"\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166"
+"\157\143\141\164\151\157\156\103\114\101\123\105\101\063\056\150"
+"\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001"
+"\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056"
+"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
+"\145\156\145\167\141\154\103\114\101\123\105\101\063\056\150\164"
+"\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010"
+"\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151"
+"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157"
+"\154\151\143\171\103\114\101\123\105\101\063\056\150\164\155\154"
+"\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240"
+"\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160"
+"\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163"
+"\062\060\060\062\103\114\101\123\105\101\063\056\143\162\154\060"
+"\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167"
+"\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123"
+"\105\101\063\056\143\162\154\060\057\006\010\053\006\001\005\005"
+"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
+"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
+"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
+"\367\015\001\001\005\005\000\003\201\201\000\112\075\040\107\032"
+"\332\211\364\172\053\061\171\354\001\300\314\001\365\326\301\374"
+"\310\303\363\120\002\121\220\130\052\237\347\065\011\133\060\012"
+"\201\000\045\107\257\324\017\016\236\140\046\250\225\247\203\010"
+"\337\055\254\351\016\367\234\310\237\313\223\105\361\272\152\306"
+"\147\121\112\151\117\153\376\175\013\057\122\051\302\120\255\044"
+"\104\355\043\263\110\313\104\100\301\003\225\014\012\170\006\022"
+"\001\365\221\061\055\111\215\273\077\105\116\054\340\350\315\265"
+"\311\024\025\014\343\007\203\233\046\165\357"
+, (PRUint32)2043 }
+};
+static const NSSItem nss_builtins_items_121 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASEA3 root", (PRUint32)17 },
+  { (void *)"\026\324\044\376\226\020\341\165\031\257\043\053\266\207\164\342"
+"\101\104\276\156"
+, (PRUint32)20 },
+  { (void *)"\006\371\353\354\314\126\235\210\272\220\365\272\260\032\340\002"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_122 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS Timestamping root", (PRUint32)22 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
+"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
+"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
+"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
+"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
+"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
+"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
+"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163"
+, (PRUint32)290 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
+"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
+"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
+"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
+"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
+"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
+"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
+"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163"
+, (PRUint32)290 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\010\070\060\202\007\241\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023\053"
+"\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155\160"
+"\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062\006"
+"\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151\155"
+"\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151\146"
+"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
+"\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001"
+"\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145"
+"\163\060\036\027\015\060\061\061\062\062\071\060\061\061\060\061"
+"\070\132\027\015\062\065\061\062\062\067\060\061\061\060\061\070"
+"\132\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002"
+"\105\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162"
+"\143\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023"
+"\011\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003"
+"\125\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145"
+"\164\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162"
+"\166\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003"
+"\125\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160"
+"\163\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066"
+"\060\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013"
+"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141"
+"\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060"
+"\062\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124"
+"\151\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164"
+"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
+"\151\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001"
+"\011\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\060\201\237\060\015\006\011\052\206\110\206\367\015"
+"\001\001\001\005\000\003\201\215\000\060\201\211\002\201\201\000"
+"\274\270\356\126\245\232\214\346\066\311\302\142\240\146\201\215"
+"\032\325\172\322\163\237\016\204\144\272\225\264\220\247\170\257"
+"\312\376\124\141\133\316\262\040\127\001\256\104\222\103\020\070"
+"\021\367\150\374\027\100\245\150\047\062\073\304\247\346\102\161"
+"\305\231\357\166\377\053\225\044\365\111\222\030\150\312\000\265"
+"\244\132\057\156\313\326\033\054\015\124\147\153\172\051\241\130"
+"\253\242\132\000\326\133\273\030\302\337\366\036\023\126\166\233"
+"\245\150\342\230\316\306\003\212\064\333\114\203\101\246\251\243"
+"\002\003\001\000\001\243\202\004\200\060\202\004\174\060\035\006"
+"\003\125\035\016\004\026\004\024\213\320\020\120\011\201\362\235"
+"\011\325\016\140\170\003\042\242\077\310\312\146\060\202\001\120"
+"\006\003\125\035\043\004\202\001\107\060\202\001\103\200\024\213"
+"\320\020\120\011\201\362\235\011\325\016\140\170\003\042\242\077"
+"\310\312\146\241\202\001\046\244\202\001\042\060\202\001\036\061"
+"\013\060\011\006\003\125\004\006\023\002\105\123\061\022\060\020"
+"\006\003\125\004\010\023\011\102\141\162\143\145\154\157\156\141"
+"\061\022\060\020\006\003\125\004\007\023\011\102\141\162\143\145"
+"\154\157\156\141\061\056\060\054\006\003\125\004\012\023\045\111"
+"\120\123\040\111\156\164\145\162\156\145\164\040\160\165\142\154"
+"\151\163\150\151\156\147\040\123\145\162\166\151\143\145\163\040"
+"\163\056\154\056\061\053\060\051\006\003\125\004\012\024\042\151"
+"\160\163\100\155\141\151\154\056\151\160\163\056\145\163\040\103"
+"\056\111\056\106\056\040\040\102\055\066\060\071\062\071\064\065"
+"\062\061\064\060\062\006\003\125\004\013\023\053\111\120\123\040"
+"\103\101\040\124\151\155\145\163\164\141\155\160\151\156\147\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\064\060\062\006\003\125\004\003"
+"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141"
+"\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\036\060"
+"\034\006\011\052\206\110\206\367\015\001\011\001\026\017\151\160"
+"\163\100\155\141\151\154\056\151\160\163\056\145\163\202\001\000"
+"\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\014"
+"\006\003\125\035\017\004\005\003\003\007\377\200\060\153\006\003"
+"\125\035\045\004\144\060\142\006\010\053\006\001\005\005\007\003"
+"\001\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001"
+"\005\005\007\003\003\006\010\053\006\001\005\005\007\003\004\006"
+"\010\053\006\001\005\005\007\003\010\006\012\053\006\001\004\001"
+"\202\067\002\001\025\006\012\053\006\001\004\001\202\067\002\001"
+"\026\006\012\053\006\001\004\001\202\067\012\003\001\006\012\053"
+"\006\001\004\001\202\067\012\003\004\060\021\006\011\140\206\110"
+"\001\206\370\102\001\001\004\004\003\002\000\007\060\032\006\003"
+"\125\035\021\004\023\060\021\201\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163\060\032\006\003\125\035\022\004"
+"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
+"\163\056\145\163\060\107\006\011\140\206\110\001\206\370\102\001"
+"\015\004\072\026\070\124\151\155\145\163\164\141\155\160\151\156"
+"\147\040\103\101\040\103\145\162\164\151\146\151\143\141\164\145"
+"\040\151\163\163\165\145\144\040\142\171\040\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\060\051\006"
+"\011\140\206\110\001\206\370\102\001\002\004\034\026\032\150\164"
+"\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057"
+"\151\160\163\062\060\060\062\057\060\100\006\011\140\206\110\001"
+"\206\370\102\001\004\004\063\026\061\150\164\164\160\072\057\057"
+"\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060"
+"\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163\164"
+"\141\155\160\151\156\147\056\143\162\154\060\105\006\011\140\206"
+"\110\001\206\370\102\001\003\004\070\026\066\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\124"
+"\151\155\145\163\164\141\155\160\151\156\147\056\150\164\155\154"
+"\077\060\102\006\011\140\206\110\001\206\370\102\001\007\004\065"
+"\026\063\150\164\164\160\072\057\057\167\167\167\056\151\160\163"
+"\056\145\163\057\151\160\163\062\060\060\062\057\162\145\156\145"
+"\167\141\154\124\151\155\145\163\164\141\155\160\151\156\147\056"
+"\150\164\155\154\077\060\100\006\011\140\206\110\001\206\370\102"
+"\001\010\004\063\026\061\150\164\164\160\072\057\057\167\167\167"
+"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
+"\160\157\154\151\143\171\124\151\155\145\163\164\141\155\160\151"
+"\156\147\056\150\164\155\154\060\177\006\003\125\035\037\004\170"
+"\060\166\060\067\240\065\240\063\206\061\150\164\164\160\072\057"
+"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
+"\060\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163"
+"\164\141\155\160\151\156\147\056\143\162\154\060\073\240\071\240"
+"\067\206\065\150\164\164\160\072\057\057\167\167\167\142\141\143"
+"\153\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062"
+"\057\151\160\163\062\060\060\062\124\151\155\145\163\164\141\155"
+"\160\151\156\147\056\143\162\154\060\057\006\010\053\006\001\005"
+"\005\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005"
+"\005\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163"
+"\160\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110"
+"\206\367\015\001\001\005\005\000\003\201\201\000\145\272\301\314"
+"\000\032\225\221\312\351\154\072\277\072\036\024\010\174\373\203"
+"\356\153\142\121\323\063\221\265\140\171\176\004\330\135\171\067"
+"\350\303\133\260\304\147\055\150\132\262\137\016\012\372\315\077"
+"\072\105\241\352\066\317\046\036\247\021\050\305\224\217\204\114"
+"\123\010\305\223\263\374\342\177\365\215\363\261\251\205\137\210"
+"\336\221\226\356\027\133\256\245\352\160\145\170\054\041\144\001"
+"\225\316\316\114\076\120\364\266\131\313\143\215\266\275\030\324"
+"\207\112\137\334\357\351\126\360\012\014\350\165"
+, (PRUint32)2108 }
+};
+static const NSSItem nss_builtins_items_123 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS Timestamping root", (PRUint32)22 },
+  { (void *)"\226\231\134\167\021\350\345\055\371\343\113\354\354\147\323\313"
+"\361\266\304\322"
+, (PRUint32)20 },
+  { (void *)"\056\003\375\305\365\327\053\224\144\301\276\211\061\361\026\233"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
+"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
+"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
+"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
+"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
+"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
+"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
+"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163"
+, (PRUint32)290 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_124 [] = {
   { (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 *)"QuoVadis Root CA", (PRUint32)17 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\177\061\013\060\011\006\003\125\004\006\023\002\102\115\061"
 "\031\060\027\006\003\125\004\012\023\020\121\165\157\126\141\144"
@@ -6810,17 +9019,17 @@ static const NSSItem nss_builtins_items_
 "\154\241\273\236\372\004\154\111\046\164\217\322\163\353\314\060"
 "\242\346\352\131\042\207\370\227\365\016\375\352\314\222\244\026"
 "\304\122\030\352\041\316\261\361\346\204\201\345\272\251\206\050"
 "\362\103\132\135\022\235\254\036\331\250\345\012\152\247\177\240"
 "\207\051\317\362\211\115\324\354\305\342\346\172\320\066\043\212"
 "\112\164\066\371"
 , (PRUint32)1492 }
 };
-static const NSSItem nss_builtins_items_99 [] = {
+static const NSSItem nss_builtins_items_125 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"QuoVadis Root CA", (PRUint32)17 },
   { (void *)"\336\077\100\275\120\223\323\233\154\140\366\332\274\007\142\001"
 "\000\211\166\311"
 , (PRUint32)20 },
@@ -6838,17 +9047,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)129 },
   { (void *)"\002\004\072\266\120\213"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_100 [] = {
+static const NSSItem nss_builtins_items_126 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"QuoVadis Root CA 2", (PRUint32)19 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\102\115\061"
 "\031\060\027\006\003\125\004\012\023\020\121\165\157\126\141\144"
@@ -6954,17 +9163,17 @@ static const NSSItem nss_builtins_items_
 "\272\027\102\202\227\161\201\123\061\251\237\366\175\142\277\162"
 "\341\243\223\035\314\212\046\132\011\070\320\316\327\015\200\026"
 "\264\170\245\072\207\114\215\212\245\325\106\227\362\054\020\271"
 "\274\124\042\300\001\120\151\103\236\364\262\357\155\370\354\332"
 "\361\343\261\357\337\221\217\124\052\013\045\301\046\031\304\122"
 "\020\005\145\325\202\020\352\302\061\315\056"
 , (PRUint32)1467 }
 };
-static const NSSItem nss_builtins_items_101 [] = {
+static const NSSItem nss_builtins_items_127 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"QuoVadis Root CA 2", (PRUint32)19 },
   { (void *)"\312\072\373\317\022\100\066\113\104\262\026\040\210\200\110\071"
 "\031\223\174\367"
 , (PRUint32)20 },
@@ -6978,17 +9187,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)71 },
   { (void *)"\002\002\005\011"
 , (PRUint32)4 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_102 [] = {
+static const NSSItem nss_builtins_items_128 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"QuoVadis Root CA 3", (PRUint32)19 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\102\115\061"
 "\031\060\027\006\003\125\004\012\023\020\121\165\157\126\141\144"
@@ -7109,17 +9318,17 @@ static const NSSItem nss_builtins_items_
 "\137\116\301\050\222\336\030\272\325\052\050\273\021\213\027\223"
 "\230\231\140\224\134\043\317\132\047\227\136\013\005\006\223\067"
 "\036\073\151\066\353\251\236\141\035\217\062\332\216\014\326\164"
 "\076\173\011\044\332\001\167\107\304\073\315\064\214\231\365\312"
 "\341\045\141\063\262\131\033\342\156\327\067\127\266\015\251\022"
 "\332"
 , (PRUint32)1697 }
 };
-static const NSSItem nss_builtins_items_103 [] = {
+static const NSSItem nss_builtins_items_129 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"QuoVadis Root CA 3", (PRUint32)19 },
   { (void *)"\037\111\024\367\330\164\225\035\335\256\002\300\276\375\072\055"
 "\202\165\121\205"
 , (PRUint32)20 },
@@ -7133,17 +9342,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)71 },
   { (void *)"\002\002\005\306"
 , (PRUint32)4 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_104 [] = {
+static const NSSItem nss_builtins_items_130 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Security Communication Root CA", (PRUint32)31 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\120\061\013\060\011\006\003\125\004\006\023\002\112\120\061"
 "\030\060\026\006\003\125\004\012\023\017\123\105\103\117\115\040"
@@ -7213,17 +9422,17 @@ static const NSSItem nss_builtins_items_
 "\045\020\313\361\072\362\331\372\333\111\126\273\246\376\247\101"
 "\065\303\340\210\141\311\210\307\337\066\020\042\230\131\352\260"
 "\112\373\126\026\163\156\254\115\367\042\241\117\255\035\172\055"
 "\105\047\345\060\301\136\362\332\023\313\045\102\121\225\107\003"
 "\214\154\041\314\164\102\355\123\377\063\213\217\017\127\001\026"
 "\057\317\246\356\311\160\042\024\275\375\276\154\013\003"
 , (PRUint32)862 }
 };
-static const NSSItem nss_builtins_items_105 [] = {
+static const NSSItem nss_builtins_items_131 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Security Communication Root CA", (PRUint32)31 },
   { (void *)"\066\261\053\111\371\201\236\327\114\236\274\070\017\306\126\217"
 "\135\254\262\367"
 , (PRUint32)20 },
@@ -7238,17 +9447,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)82 },
   { (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_106 [] = {
+static const NSSItem nss_builtins_items_132 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Sonera Class 1 Root CA", (PRUint32)23 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\071\061\013\060\011\006\003\125\004\006\023\002\106\111\061"
 "\017\060\015\006\003\125\004\012\023\006\123\157\156\145\162\141"
@@ -7311,17 +9520,17 @@ static const NSSItem nss_builtins_items_
 "\221\132\302\250\207\261\126\150\224\171\371\045\367\301\325\256"
 "\032\270\273\075\217\251\212\070\025\367\163\320\132\140\321\200"
 "\260\360\334\325\120\315\116\356\222\110\151\355\262\043\036\060"
 "\314\310\224\310\266\365\073\206\177\077\246\056\237\366\076\054"
 "\265\222\226\076\337\054\223\212\377\201\214\017\017\131\041\031"
 "\127\275\125\232"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_107 [] = {
+static const NSSItem nss_builtins_items_133 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Sonera Class 1 Root CA", (PRUint32)23 },
   { (void *)"\007\107\042\001\231\316\164\271\174\260\075\171\262\144\242\310"
 "\125\351\063\377"
 , (PRUint32)20 },
@@ -7334,17 +9543,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)59 },
   { (void *)"\002\001\044"
 , (PRUint32)3 },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_108 [] = {
+static const NSSItem nss_builtins_items_134 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Sonera Class 2 Root CA", (PRUint32)23 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\071\061\013\060\011\006\003\125\004\006\023\002\106\111\061"
 "\017\060\015\006\003\125\004\012\023\006\123\157\156\145\162\141"
@@ -7407,17 +9616,17 @@ static const NSSItem nss_builtins_items_
 "\116\116\236\314\014\215\224\334\331\105\234\136\354\102\120\143"
 "\256\364\135\304\261\022\334\312\073\250\056\235\024\132\005\165"
 "\267\354\327\143\342\272\065\266\004\010\221\350\332\235\234\366"
 "\146\265\030\254\012\246\124\046\064\063\322\033\301\324\177\032"
 "\072\216\013\252\062\156\333\374\117\045\237\331\062\307\226\132"
 "\160\254\337\114"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_109 [] = {
+static const NSSItem nss_builtins_items_135 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Sonera Class 2 Root CA", (PRUint32)23 },
   { (void *)"\067\367\155\346\007\174\220\305\261\076\223\032\267\101\020\264"
 "\362\344\232\047"
 , (PRUint32)20 },
@@ -7430,17 +9639,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)59 },
   { (void *)"\002\001\035"
 , (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_110 [] = {
+static const NSSItem nss_builtins_items_136 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Staat der Nederlanden Root CA", (PRUint32)30 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\125\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
 "\036\060\034\006\003\125\004\012\023\025\123\164\141\141\164\040"
@@ -7516,17 +9725,17 @@ static const NSSItem nss_builtins_items_
 "\355\220\004\301\261\051\221\305\060\157\301\251\162\063\314\376"
 "\135\026\027\054\021\151\347\176\376\305\203\010\337\274\334\042"
 "\072\056\040\151\043\071\126\140\147\220\213\056\166\071\373\021"
 "\210\227\366\174\275\113\270\040\026\147\005\215\342\073\301\162"
 "\077\224\225\067\307\135\271\236\330\223\241\027\217\377\014\146"
 "\025\301\044\174\062\174\003\035\073\241\130\105\062\223"
 , (PRUint32)958 }
 };
-static const NSSItem nss_builtins_items_111 [] = {
+static const NSSItem nss_builtins_items_137 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Staat der Nederlanden Root CA", (PRUint32)30 },
   { (void *)"\020\035\372\077\325\013\313\273\233\265\140\014\031\125\244\032"
 "\364\163\072\004"
 , (PRUint32)20 },
@@ -7541,17 +9750,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)87 },
   { (void *)"\002\004\000\230\226\212"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_112 [] = {
+static const NSSItem nss_builtins_items_138 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TDC Internet Root CA", (PRUint32)21 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\103\061\013\060\011\006\003\125\004\006\023\002\104\113\061"
 "\025\060\023\006\003\125\004\012\023\014\124\104\103\040\111\156"
@@ -7632,17 +9841,17 @@ static const NSSItem nss_builtins_items_
 "\043\177\074\112\320\257\300\257\366\357\033\265\025\304\353\203"
 "\304\011\137\164\213\331\021\373\302\126\261\074\370\160\312\064"
 "\215\103\100\023\214\375\231\003\124\171\306\056\352\206\241\366"
 "\072\324\011\274\364\274\146\314\075\130\320\127\111\012\356\045"
 "\342\101\356\023\371\233\070\064\321\000\365\176\347\224\035\374"
 "\151\003\142\270\231\005\005\075\153\170\022\275\260\157\145"
 , (PRUint32)1071 }
 };
-static const NSSItem nss_builtins_items_113 [] = {
+static const NSSItem nss_builtins_items_139 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TDC Internet Root CA", (PRUint32)21 },
   { (void *)"\041\374\275\216\177\154\257\005\033\321\263\103\354\250\347\141"
 "\107\362\017\212"
 , (PRUint32)20 },
@@ -7656,17 +9865,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)69 },
   { (void *)"\002\004\072\314\245\114"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_114 [] = {
+static const NSSItem nss_builtins_items_140 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TDC OCES Root CA", (PRUint32)17 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\061\061\013\060\011\006\003\125\004\006\023\002\104\113\061"
 "\014\060\012\006\003\125\004\012\023\003\124\104\103\061\024\060"
@@ -7760,17 +9969,17 @@ static const NSSItem nss_builtins_items_
 "\232\237\135\215\340\074\144\271\032\022\222\052\307\202\104\162"
 "\071\334\342\074\306\330\125\365\025\116\310\005\016\333\306\320"
 "\142\246\354\025\264\265\002\202\333\254\214\242\201\360\233\231"
 "\061\365\040\040\250\210\141\012\007\237\224\374\320\327\033\314"
 "\056\027\363\004\047\166\147\353\124\203\375\244\220\176\006\075"
 "\004\243\103\055\332\374\013\142\352\057\137\142\123"
 , (PRUint32)1309 }
 };
-static const NSSItem nss_builtins_items_115 [] = {
+static const NSSItem nss_builtins_items_141 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TDC OCES Root CA", (PRUint32)17 },
   { (void *)"\207\201\302\132\226\275\302\373\114\145\006\117\371\071\013\046"
 "\004\212\016\001"
 , (PRUint32)20 },
@@ -7783,17 +9992,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)51 },
   { (void *)"\002\004\076\110\275\304"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_116 [] = {
+static const NSSItem nss_builtins_items_142 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"UTN DATACorp SGC Root CA", (PRUint32)25 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\223\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
@@ -7889,17 +10098,17 @@ static const NSSItem nss_builtins_items_
 "\163\035\122\046\070\034\030\111\375\060\164\232\304\345\042\057"
 "\330\300\215\355\221\172\114\000\217\162\177\135\332\335\033\213"
 "\105\153\347\335\151\227\250\305\126\114\017\014\366\237\172\221"
 "\067\366\227\202\340\335\161\151\377\166\077\140\115\074\317\367"
 "\231\371\306\127\364\311\125\071\170\272\054\171\311\246\210\053"
 "\364\010"
 , (PRUint32)1122 }
 };
-static const NSSItem nss_builtins_items_117 [] = {
+static const NSSItem nss_builtins_items_143 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"UTN DATACorp SGC Root CA", (PRUint32)25 },
   { (void *)"\130\021\237\016\022\202\207\352\120\375\331\207\105\157\117\170"
 "\334\372\326\324"
 , (PRUint32)20 },
@@ -7919,17 +10128,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\104\276\014\213\120\000\041\264\021\323\052\150\006\251"
 "\255\151"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_118 [] = {
+static const NSSItem nss_builtins_items_144 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"UTN USERFirst Email Root CA", (PRUint32)28 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
@@ -8033,17 +10242,17 @@ static const NSSItem nss_builtins_items_
 "\170\346\123\117\261\350\267\323\024\236\223\246\303\144\343\254"
 "\176\161\315\274\237\351\003\033\314\373\351\254\061\301\257\174"
 "\025\164\002\231\303\262\107\246\302\062\141\327\307\157\110\044"
 "\121\047\241\325\207\125\362\173\217\230\075\026\236\356\165\266"
 "\370\320\216\362\363\306\256\050\133\247\360\363\066\027\374\303"
 "\005\323\312\003\112\124"
 , (PRUint32)1190 }
 };
-static const NSSItem nss_builtins_items_119 [] = {
+static const NSSItem nss_builtins_items_145 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"UTN USERFirst Email Root CA", (PRUint32)28 },
   { (void *)"\261\162\261\245\155\225\371\037\345\002\207\341\115\067\352\152"
 "\104\143\166\212"
 , (PRUint32)20 },
@@ -8065,17 +10274,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\045\045\147"
 "\311\211"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_120 [] = {
+static const NSSItem nss_builtins_items_146 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"UTN USERFirst Hardware Root CA", (PRUint32)31 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
@@ -8172,17 +10381,17 @@ static const NSSItem nss_builtins_items_
 "\335\166\326\071\060\202\360\253\234\122\362\052\307\257\111\136"
 "\176\307\150\345\202\201\310\152\047\371\047\210\052\325\130\120"
 "\225\037\360\073\034\127\273\175\024\071\142\053\232\311\224\222"
 "\052\243\042\014\377\211\046\175\137\043\053\107\327\025\035\251"
 "\152\236\121\015\052\121\236\201\371\324\073\136\160\022\177\020"
 "\062\234\036\273\235\370\146\250"
 , (PRUint32)1144 }
 };
-static const NSSItem nss_builtins_items_121 [] = {
+static const NSSItem nss_builtins_items_147 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"UTN USERFirst Hardware Root CA", (PRUint32)31 },
   { (void *)"\004\203\355\063\231\254\066\010\005\207\042\355\274\136\106\000"
 "\343\276\371\327"
 , (PRUint32)20 },
@@ -8202,17 +10411,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\052\376\145"
 "\012\375"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_122 [] = {
+static const NSSItem nss_builtins_items_148 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"UTN USERFirst Object Root CA", (PRUint32)29 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\225\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
@@ -8308,17 +10517,17 @@ static const NSSItem nss_builtins_items_
 "\064\026\111\146\076\120\106\311\143\161\070\061\142\270\142\271"
 "\363\123\255\154\265\053\242\022\252\031\117\011\332\136\347\223"
 "\306\216\024\010\376\360\060\200\030\240\206\205\115\310\175\327"
 "\213\003\376\156\325\367\235\026\254\222\054\240\043\345\234\221"
 "\122\037\224\337\027\224\163\303\263\301\301\161\005\040\000\170"
 "\275\023\122\035\250\076\315\000\037\310"
 , (PRUint32)1130 }
 };
-static const NSSItem nss_builtins_items_123 [] = {
+static const NSSItem nss_builtins_items_149 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"UTN USERFirst Object Root CA", (PRUint32)29 },
   { (void *)"\341\055\373\113\101\327\331\303\053\060\121\113\254\035\201\330"
 "\070\136\055\106"
 , (PRUint32)20 },
@@ -8338,17 +10547,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\055\340\263"
 "\137\033"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trust_unknown, (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_124 [] = {
+static const NSSItem nss_builtins_items_150 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Camerfirma Chambers of Commerce Root", (PRUint32)37 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\177\061\013\060\011\006\003\125\004\006\023\002\105\125\061"
 "\047\060\045\006\003\125\004\012\023\036\101\103\040\103\141\155"
@@ -8447,17 +10656,17 @@ static const NSSItem nss_builtins_items_
 "\327\167\037\347\000\074\235\157\216\344\062\011\035\115\170\064"
 "\170\064\074\224\233\046\355\117\161\306\031\172\275\040\042\110"
 "\132\376\113\175\003\267\347\130\276\306\062\116\164\036\150\335"
 "\250\150\133\263\076\356\142\175\331\200\350\012\165\172\267\356"
 "\264\145\232\041\220\340\252\320\230\274\070\265\163\074\213\370"
 "\334"
 , (PRUint32)1217 }
 };
-static const NSSItem nss_builtins_items_125 [] = {
+static const NSSItem nss_builtins_items_151 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Camerfirma Chambers of Commerce Root", (PRUint32)37 },
   { (void *)"\156\072\125\244\031\014\031\134\223\204\074\300\333\162\056\061"
 "\060\141\360\261"
 , (PRUint32)20 },
@@ -8475,17 +10684,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)129 },
   { (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_126 [] = {
+static const NSSItem nss_builtins_items_152 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Camerfirma Global Chambersign Root", (PRUint32)35 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\175\061\013\060\011\006\003\125\004\006\023\002\105\125\061"
 "\047\060\045\006\003\125\004\012\023\036\101\103\040\103\141\155"
@@ -8582,17 +10791,17 @@ static const NSSItem nss_builtins_items_
 "\045\310\062\370\040\021\315\175\062\063\110\224\124\114\335\334"
 "\171\304\060\237\353\216\270\125\265\327\210\134\305\152\044\075"
 "\262\323\005\003\121\306\007\357\314\024\162\164\075\156\162\316"
 "\030\050\214\112\240\167\345\011\053\105\104\107\254\267\147\177"
 "\001\212\005\132\223\276\241\301\377\370\347\016\147\244\107\111"
 "\166\135\165\220\032\365\046\217\360"
 , (PRUint32)1225 }
 };
-static const NSSItem nss_builtins_items_127 [] = {
+static const NSSItem nss_builtins_items_153 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Camerfirma Global Chambersign Root", (PRUint32)35 },
   { (void *)"\063\233\153\024\120\044\233\125\172\001\207\162\204\331\340\057"
 "\303\322\330\351"
 , (PRUint32)20 },
@@ -8609,17 +10818,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)127 },
   { (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_128 [] = {
+static const NSSItem nss_builtins_items_154 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"NetLock Qualified (Class QA) Root", (PRUint32)34 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\110\125"
 "\061\021\060\017\006\003\125\004\007\023\010\102\165\144\141\160"
@@ -8759,17 +10968,17 @@ static const NSSItem nss_builtins_items_
 "\243\234\264\163\062\112\226\231\376\274\177\310\045\130\370\130"
 "\363\166\146\211\124\244\246\076\304\120\134\272\211\030\202\165"
 "\110\041\322\117\023\350\140\176\007\166\333\020\265\121\346\252"
 "\271\150\252\315\366\235\220\165\022\352\070\032\312\104\350\267"
 "\231\247\052\150\225\146\225\253\255\357\211\313\140\251\006\022"
 "\306\224\107\351\050"
 , (PRUint32)1749 }
 };
-static const NSSItem nss_builtins_items_129 [] = {
+static const NSSItem nss_builtins_items_155 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"NetLock Qualified (Class QA) Root", (PRUint32)34 },
   { (void *)"\001\150\227\341\240\270\362\303\261\064\146\134\040\247\047\267"
 "\241\130\342\217"
 , (PRUint32)20 },
@@ -8791,17 +11000,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)204 },
   { (void *)"\002\001\173"
 , (PRUint32)3 },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_130 [] = {
+static const NSSItem nss_builtins_items_156 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"NetLock Notary (Class A) Root", (PRUint32)30 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\257\061\013\060\011\006\003\125\004\006\023\002\110\125"
 "\061\020\060\016\006\003\125\004\010\023\007\110\165\156\147\141"
@@ -8934,17 +11143,17 @@ static const NSSItem nss_builtins_items_
 "\177\132\233\024\130\001\047\176\023\120\307\153\052\346\150\074"
 "\277\134\240\012\033\341\016\172\351\342\200\303\351\351\366\375"
 "\154\021\236\320\345\050\047\053\124\062\102\024\202\165\346\112"
 "\360\053\146\165\143\214\242\373\004\076\203\016\233\066\360\030"
 "\344\046\040\303\214\360\050\007\255\074\027\146\210\265\375\266"
 "\210"
 , (PRUint32)1665 }
 };
-static const NSSItem nss_builtins_items_131 [] = {
+static const NSSItem nss_builtins_items_157 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"NetLock Notary (Class A) Root", (PRUint32)30 },
   { (void *)"\254\355\137\145\123\375\045\316\001\137\037\172\110\073\152\164"
 "\237\141\170\306"
 , (PRUint32)20 },
@@ -8965,17 +11174,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)178 },
   { (void *)"\002\002\001\003"
 , (PRUint32)4 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_132 [] = {
+static const NSSItem nss_builtins_items_158 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"NetLock Business (Class B) Root", (PRUint32)32 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\231\061\013\060\011\006\003\125\004\006\023\002\110\125"
 "\061\021\060\017\006\003\125\004\007\023\010\102\165\144\141\160"
@@ -9084,17 +11293,17 @@ static const NSSItem nss_builtins_items_
 "\306\051\226\314\041\300\155\074\245\164\317\330\202\245\071\303"
 "\145\343\102\160\273\042\220\343\175\333\065\166\341\240\265\332"
 "\237\160\156\223\032\060\071\035\060\333\056\343\174\262\221\262"
 "\321\067\051\372\271\326\027\134\107\117\343\035\070\353\237\325"
 "\173\225\250\050\236\025\112\321\321\320\053\000\227\240\342\222"
 "\066\053\143\254\130\001\153\063\051\120\206\203\361\001\110"
 , (PRUint32)1359 }
 };
-static const NSSItem nss_builtins_items_133 [] = {
+static const NSSItem nss_builtins_items_159 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"NetLock Business (Class B) Root", (PRUint32)32 },
   { (void *)"\207\237\113\356\005\337\230\130\073\343\140\326\063\347\015\077"
 "\376\230\161\257"
 , (PRUint32)20 },
@@ -9113,17 +11322,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)156 },
   { (void *)"\002\001\151"
 , (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_134 [] = {
+static const NSSItem nss_builtins_items_160 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"NetLock Express (Class C) Root", (PRUint32)31 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\233\061\013\060\011\006\003\125\004\006\023\002\110\125"
 "\061\021\060\017\006\003\125\004\007\023\010\102\165\144\141\160"
@@ -9233,17 +11442,17 @@ static const NSSItem nss_builtins_items_
 "\375\361\355\344\173\113\240\154\265\253\232\127\160\246\355\240"
 "\244\355\056\365\375\374\275\376\115\067\010\014\274\343\226\203"
 "\042\365\111\033\177\113\053\264\124\301\200\174\231\116\035\320"
 "\214\356\320\254\345\222\372\165\126\376\144\240\023\217\270\270"
 "\026\235\141\005\147\200\310\320\330\245\007\002\064\230\004\215"
 "\063\004\324"
 , (PRUint32)1363 }
 };
-static const NSSItem nss_builtins_items_135 [] = {
+static const NSSItem nss_builtins_items_161 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"NetLock Express (Class C) Root", (PRUint32)31 },
   { (void *)"\343\222\121\057\012\317\365\005\337\366\336\006\177\165\067\341"
 "\145\352\127\113"
 , (PRUint32)20 },
@@ -9262,17 +11471,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)158 },
   { (void *)"\002\001\150"
 , (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_136 [] = {
+static const NSSItem nss_builtins_items_162 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"XRamp Global CA Root", (PRUint32)21 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\202\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\036\060\034\006\003\125\004\013\023\025\167\167\167\056\170"
@@ -9363,17 +11572,17 @@ static const NSSItem nss_builtins_items_
 "\176\034\033\333\152\200\017\041\274\351\333\246\267\100\364\262"
 "\213\251\261\344\357\232\032\320\075\151\231\356\250\050\243\341"
 "\074\263\360\262\021\234\317\174\100\346\335\347\103\175\242\330"
 "\072\265\251\215\362\064\231\304\324\020\341\006\375\011\204\020"
 "\073\356\304\114\364\354\047\174\102\302\164\174\202\212\011\311"
 "\264\003\045\274"
 , (PRUint32)1076 }
 };
-static const NSSItem nss_builtins_items_137 [] = {
+static const NSSItem nss_builtins_items_163 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"XRamp Global CA Root", (PRUint32)21 },
   { (void *)"\270\001\206\321\353\234\206\245\101\004\317\060\124\363\114\122"
 "\267\345\130\306"
 , (PRUint32)20 },
@@ -9392,17 +11601,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\120\224\154\354\030\352\325\234\115\325\227\357\165\217"
 "\240\255"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_138 [] = {
+static const NSSItem nss_builtins_items_164 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Go Daddy Class 2 CA", (PRUint32)20 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\041\060\037\006\003\125\004\012\023\030\124\150\145\040\107\157"
@@ -9485,17 +11694,17 @@ static const NSSItem nss_builtins_items_
 "\353\116\046\266\163\053\344\323\366\114\376\046\161\342\141\021"
 "\164\112\377\127\032\207\017\165\110\056\317\121\151\027\240\002"
 "\022\141\225\325\321\100\262\020\114\356\304\254\020\103\246\245"
 "\236\012\325\225\142\232\015\317\210\202\305\062\014\344\053\237"
 "\105\346\015\237\050\234\261\271\052\132\127\255\067\017\257\035"
 "\177\333\275\237"
 , (PRUint32)1028 }
 };
-static const NSSItem nss_builtins_items_139 [] = {
+static const NSSItem nss_builtins_items_165 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Go Daddy Class 2 CA", (PRUint32)20 },
   { (void *)"\047\226\272\346\077\030\001\342\167\046\033\240\327\167\160\002"
 "\217\040\356\344"
 , (PRUint32)20 },
@@ -9511,17 +11720,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)101 },
   { (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_140 [] = {
+static const NSSItem nss_builtins_items_166 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Starfield Class 2 CA", (PRUint32)21 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\150\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\045\060\043\006\003\125\004\012\023\034\123\164\141\162\146\151"
@@ -9605,17 +11814,17 @@ static const NSSItem nss_builtins_items_
 "\125\042\130\000\043\352\343\022\103\051\133\107\010\335\214\101"
 "\152\145\006\250\345\041\252\101\264\225\041\225\271\175\321\064"
 "\253\023\326\255\274\334\342\075\071\315\275\076\165\160\241\030"
 "\131\003\311\042\264\217\234\325\136\052\327\245\266\324\012\155"
 "\370\267\100\021\106\232\037\171\016\142\277\017\227\354\340\057"
 "\037\027\224"
 , (PRUint32)1043 }
 };
-static const NSSItem nss_builtins_items_141 [] = {
+static const NSSItem nss_builtins_items_167 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Starfield Class 2 CA", (PRUint32)21 },
   { (void *)"\255\176\034\050\260\144\357\217\140\003\100\040\024\303\320\343"
 "\067\016\265\212"
 , (PRUint32)20 },
@@ -9631,17 +11840,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)106 },
   { (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_142 [] = {
+static const NSSItem nss_builtins_items_168 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"StartCom Certification Authority", (PRUint32)33 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\175\061\013\060\011\006\003\125\004\006\023\002\111\114\061"
 "\026\060\024\006\003\125\004\012\023\015\123\164\141\162\164\103"
@@ -9786,17 +11995,17 @@ static const NSSItem nss_builtins_items_
 "\126\044\373\037\277\016\171\251\130\056\271\304\011\001\176\225"
 "\272\155\000\006\076\262\352\112\020\071\330\320\053\365\277\354"
 "\165\277\227\002\305\011\033\010\334\125\067\342\201\373\067\204"
 "\103\142\040\312\347\126\113\145\352\376\154\301\044\223\044\241"
 "\064\353\005\377\232\042\256\233\175\077\361\145\121\012\246\060"
 "\152\263\364\210\034\200\015\374\162\212\350\203\136"
 , (PRUint32)1997 }
 };
-static const NSSItem nss_builtins_items_143 [] = {
+static const NSSItem nss_builtins_items_169 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"StartCom Certification Authority", (PRUint32)33 },
   { (void *)"\076\053\367\362\003\033\226\363\214\346\304\330\250\135\076\055"
 "\130\107\152\017"
 , (PRUint32)20 },
@@ -9813,17 +12022,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)127 },
   { (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_144 [] = {
+static const NSSItem nss_builtins_items_170 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Taiwan GRCA", (PRUint32)12 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\077\061\013\060\011\006\003\125\004\006\023\002\124\127\061"
 "\060\060\056\006\003\125\004\012\014\047\107\157\166\145\162\156"
@@ -9926,17 +12135,17 @@ static const NSSItem nss_builtins_items_
 "\220\124\221\003\074\107\345\325\311\145\340\267\113\175\354\107"
 "\323\263\013\076\255\236\320\164\000\016\353\275\121\255\300\336"
 "\054\300\303\152\376\357\334\013\247\372\106\337\140\333\234\246"
 "\131\120\165\043\151\163\223\262\371\374\002\323\107\346\161\316"
 "\020\002\356\047\214\204\377\254\105\015\023\134\203\062\340\045"
 "\245\206\054\174\364\022"
 , (PRUint32)1398 }
 };
-static const NSSItem nss_builtins_items_145 [] = {
+static const NSSItem nss_builtins_items_171 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Taiwan GRCA", (PRUint32)12 },
   { (void *)"\364\213\021\277\336\253\276\224\124\040\161\346\101\336\153\276"
 "\210\053\100\271"
 , (PRUint32)20 },
@@ -9951,17 +12160,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\037\235\131\132\327\057\302\006\104\245\200\010\151\343"
 "\136\366"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_146 [] = {
+static const NSSItem nss_builtins_items_172 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Firmaprofesional Root CA", (PRUint32)25 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\235\061\013\060\011\006\003\125\004\006\023\002\105\123"
 "\061\042\060\040\006\003\125\004\007\023\031\103\057\040\115\165"
@@ -10055,17 +12264,17 @@ static const NSSItem nss_builtins_items_
 "\200\246\355\210\307\137\120\142\002\350\231\164\026\320\346\264"
 "\071\361\047\313\310\100\326\343\206\020\251\043\022\222\340\151"
 "\101\143\247\257\045\013\300\305\222\313\036\230\243\132\272\305"
 "\063\017\240\227\001\335\177\340\173\326\006\124\317\241\342\115"
 "\070\353\113\120\265\313\046\364\312\332\160\112\152\241\342\171"
 "\252\341\247\063\366\375\112\037\366\331\140"
 , (PRUint32)1115 }
 };
-static const NSSItem nss_builtins_items_147 [] = {
+static const NSSItem nss_builtins_items_173 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Firmaprofesional Root CA", (PRUint32)25 },
   { (void *)"\251\142\217\113\230\251\033\110\065\272\322\301\106\062\206\273"
 "\146\144\152\214"
 , (PRUint32)20 },
@@ -10084,17 +12293,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)160 },
   { (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_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_148 [] = {
+static const NSSItem nss_builtins_items_174 [] = {
   { (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 *)"Wells Fargo Root CA", (PRUint32)20 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\202\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\024\060\022\006\003\125\004\012\023\013\127\145\154\154\163"
@@ -10179,17 +12388,17 @@ static const NSSItem nss_builtins_items_
 "\307\175\245\333\017\047\321\306\362\100\210\346\037\366\141\250"
 "\364\102\310\271\067\323\251\276\054\126\170\302\162\233\131\135"
 "\065\100\212\350\116\143\032\266\351\040\152\121\342\316\244\220"
 "\337\166\160\231\134\160\103\115\267\266\247\031\144\116\222\267"
 "\305\221\074\177\110\026\145\173\026\375\313\374\373\331\325\326"
 "\117\041\145\073\112\177\107\243\373"
 , (PRUint32)1001 }
 };
-static const NSSItem nss_builtins_items_149 [] = {
+static const NSSItem nss_builtins_items_175 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Wells Fargo Root CA", (PRUint32)20 },
   { (void *)"\223\346\253\042\003\003\265\043\050\334\332\126\236\272\344\321"
 "\321\314\373\145"
 , (PRUint32)20 },
@@ -10207,17 +12416,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)133 },
   { (void *)"\002\004\071\344\227\236"
 , (PRUint32)6 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_150 [] = {
+static const NSSItem nss_builtins_items_176 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Swisscom Root CA 1", (PRUint32)19 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\144\061\013\060\011\006\003\125\004\006\023\002\143\150\061"
 "\021\060\017\006\003\125\004\012\023\010\123\167\151\163\163\143"
@@ -10330,17 +12539,17 @@ static const NSSItem nss_builtins_items_
 "\062\240\032\015\023\244\224\125\161\245\026\213\272\312\211\260"
 "\262\307\374\217\330\124\265\223\142\235\316\317\131\373\075\030"
 "\316\052\313\065\025\202\135\377\124\042\133\161\122\373\267\311"
 "\376\140\233\000\101\144\360\252\052\354\266\102\103\316\211\146"
 "\201\310\213\237\071\124\003\045\323\026\065\216\204\320\137\372"
 "\060\032\365\232\154\364\016\123\371\072\133\321\034"
 , (PRUint32)1501 }
 };
-static const NSSItem nss_builtins_items_151 [] = {
+static const NSSItem nss_builtins_items_177 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Swisscom Root CA 1", (PRUint32)19 },
   { (void *)"\137\072\374\012\213\144\366\206\147\064\164\337\176\251\242\376"
 "\371\372\172\121"
 , (PRUint32)20 },
@@ -10357,17 +12566,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\134\013\205\134\013\347\131\101\337\127\314\077\177\235"
 "\250\066"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_152 [] = {
+static const NSSItem nss_builtins_items_178 [] = {
   { (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 *)"DigiCert Assured ID Root CA", (PRUint32)28 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\025\060\023\006\003\125\004\012\023\014\104\151\147\151\103\145"
@@ -10446,17 +12655,17 @@ static const NSSItem nss_builtins_items_
 "\037\153\014\066\007\026\177\067\174\251\133\155\172\361\022\106"
 "\140\203\327\047\004\276\113\316\227\276\303\147\052\150\021\337"
 "\200\347\014\063\146\277\023\015\024\156\363\177\037\143\020\036"
 "\372\215\033\045\155\154\217\245\267\141\001\261\322\243\046\241"
 "\020\161\235\255\342\303\371\303\231\121\267\053\007\010\316\056"
 "\346\120\262\247\372\012\105\057\242\360\362"
 , (PRUint32)955 }
 };
-static const NSSItem nss_builtins_items_153 [] = {
+static const NSSItem nss_builtins_items_179 [] = {
   { (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 *)"DigiCert Assured ID Root CA", (PRUint32)28 },
   { (void *)"\005\143\270\143\015\142\327\132\273\310\253\036\113\337\265\250"
 "\231\262\115\103"
 , (PRUint32)20 },
@@ -10473,17 +12682,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\014\347\340\345\027\330\106\376\217\345\140\374\033\360"
 "\060\071"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_154 [] = {
+static const NSSItem nss_builtins_items_180 [] = {
   { (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 *)"DigiCert Global Root CA", (PRUint32)24 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\025\060\023\006\003\125\004\012\023\014\104\151\147\151\103\145"
@@ -10562,17 +12771,17 @@ static const NSSItem nss_builtins_items_
 "\141\041\030\325\004\255\170\074\054\072\200\153\247\353\257\025"
 "\024\351\330\211\301\271\070\154\342\221\154\212\377\144\271\167"
 "\045\127\060\300\033\044\243\341\334\351\337\107\174\265\264\044"
 "\010\005\060\354\055\275\013\277\105\277\120\271\251\363\353\230"
 "\001\022\255\310\210\306\230\064\137\215\012\074\306\351\325\225"
 "\225\155\336"
 , (PRUint32)947 }
 };
-static const NSSItem nss_builtins_items_155 [] = {
+static const NSSItem nss_builtins_items_181 [] = {
   { (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 *)"DigiCert Global Root CA", (PRUint32)24 },
   { (void *)"\250\230\135\072\145\345\345\304\262\327\326\155\100\306\335\057"
 "\261\234\124\066"
 , (PRUint32)20 },
@@ -10589,17 +12798,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\010\073\340\126\220\102\106\261\241\165\152\311\131\221"
 "\307\112"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_156 [] = {
+static const NSSItem nss_builtins_items_182 [] = {
   { (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 *)"DigiCert High Assurance EV Root CA", (PRUint32)35 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\154\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\025\060\023\006\003\125\004\012\023\014\104\151\147\151\103\145"
@@ -10679,17 +12888,17 @@ static const NSSItem nss_builtins_items_
 "\342\300\020\127\270\310\166\022\221\125\362\110\151\330\274\052"
 "\002\133\017\104\324\040\061\333\364\272\160\046\135\220\140\236"
 "\274\113\027\011\057\264\313\036\103\150\311\007\047\301\322\134"
 "\367\352\041\271\150\022\234\074\234\277\236\374\200\134\233\143"
 "\315\354\107\252\045\047\147\240\067\363\000\202\175\124\327\251"
 "\370\351\056\023\243\167\350\037\112"
 , (PRUint32)969 }
 };
-static const NSSItem nss_builtins_items_157 [] = {
+static const NSSItem nss_builtins_items_183 [] = {
   { (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 *)"DigiCert High Assurance EV Root CA", (PRUint32)35 },
   { (void *)"\137\267\356\006\063\342\131\333\255\014\114\232\346\323\217\032"
 "\141\307\334\045"
 , (PRUint32)20 },
@@ -10706,17 +12915,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\002\254\134\046\152\013\100\233\217\013\171\362\256\106"
 "\045\167"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_158 [] = {
+static const NSSItem nss_builtins_items_184 [] = {
   { (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 *)"Certplus Class 2 Primary CA", (PRUint32)28 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\075\061\013\060\011\006\003\125\004\006\023\002\106\122\061"
 "\021\060\017\006\003\125\004\012\023\010\103\145\162\164\160\154"
@@ -10787,17 +12996,17 @@ static const NSSItem nss_builtins_items_
 "\003\232\107\054\060\276\126\306\247\102\002\160\033\352\100\330"
 "\272\005\003\160\007\244\226\377\375\110\063\012\341\334\245\201"
 "\220\233\115\335\175\347\347\262\315\134\310\152\225\370\245\366"
 "\215\304\135\170\010\276\173\006\326\111\317\031\066\120\043\056"
 "\010\346\236\005\115\107\030\325\026\351\261\326\266\020\325\273"
 "\227\277\242\216\264\124"
 , (PRUint32)918 }
 };
-static const NSSItem nss_builtins_items_159 [] = {
+static const NSSItem nss_builtins_items_185 [] = {
   { (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 *)"Certplus Class 2 Primary CA", (PRUint32)28 },
   { (void *)"\164\040\164\101\162\234\335\222\354\171\061\330\043\020\215\302"
 "\201\222\342\273"
 , (PRUint32)20 },
@@ -10811,17 +13020,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\021\000\205\275\113\363\330\332\343\151\366\224\327\137\303"
 "\245\104\043"
 , (PRUint32)19 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_160 [] = {
+static const NSSItem nss_builtins_items_186 [] = {
   { (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 *)"DST Root CA X3", (PRUint32)15 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\077\061\044\060\042\006\003\125\004\012\023\033\104\151\147"
 "\151\164\141\154\040\123\151\147\156\141\164\165\162\145\040\124"
@@ -10889,17 +13098,17 @@ static const NSSItem nss_builtins_items_
 "\147\267\130\253\376\147\166\161\170\333\015\242\126\024\023\071"
 "\044\061\205\242\250\002\132\060\107\341\335\120\007\274\002\011"
 "\220\000\353\144\143\140\233\026\274\210\311\022\346\322\175\221"
 "\213\371\075\062\215\145\264\351\174\261\127\166\352\305\266\050"
 "\071\277\025\145\034\310\366\167\226\152\012\215\167\013\330\221"
 "\013\004\216\007\333\051\266\012\356\235\202\065\065\020"
 , (PRUint32)846 }
 };
-static const NSSItem nss_builtins_items_161 [] = {
+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 *)"DST Root CA X3", (PRUint32)15 },
   { (void *)"\332\311\002\117\124\330\366\337\224\223\137\261\163\046\070\312"
 "\152\327\174\023"
 , (PRUint32)20 },
@@ -10914,17 +13123,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\104\257\260\200\326\243\047\272\211\060\071\206\056\370"
 "\100\153"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_162 [] = {
+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 *)"DST ACES CA X6", (PRUint32)15 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\133\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\040\060\036\006\003\125\004\012\023\027\104\151\147\151\164\141"
@@ -11006,17 +13215,17 @@ static const NSSItem nss_builtins_items_
 "\370\330\322\047\075\031\211\137\132\173\212\073\314\014\332\121"
 "\256\307\013\367\053\260\067\005\354\274\127\043\342\070\322\233"
 "\150\363\126\022\210\117\102\174\270\061\304\265\333\344\310\041"
 "\064\351\110\021\065\356\372\307\222\127\305\237\064\344\307\366"
 "\367\016\013\114\234\150\170\173\161\061\307\353\036\340\147\101"
 "\363\267\240\247\315\345\172\063\066\152\372\232\053"
 , (PRUint32)1037 }
 };
-static const NSSItem nss_builtins_items_163 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"DST ACES CA X6", (PRUint32)15 },
   { (void *)"\100\124\332\157\034\077\100\164\254\355\017\354\315\333\171\321"
 "\123\373\220\035"
 , (PRUint32)20 },
@@ -11032,17 +13241,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\015\136\231\012\326\235\267\170\354\330\007\126\073\206"
 "\025\331"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_164 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TURKTRUST Certificate Services Provider Root 1", (PRUint32)47 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\267\061\077\060\075\006\003\125\004\003\014\066\124\303"
 "\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157"
@@ -11134,17 +13343,17 @@ static const NSSItem nss_builtins_items_
 "\333\217\300\151\051\227\052\243\256\030\043\227\034\101\052\213"
 "\174\052\301\174\220\350\251\050\300\323\221\306\255\050\207\100"
 "\150\265\377\354\247\322\323\070\030\234\323\175\151\135\360\306"
 "\245\036\044\033\243\107\374\151\007\150\347\344\232\264\355\017"
 "\241\207\207\002\316\207\322\110\116\341\274\377\313\361\162\222"
 "\104\144\003\045\352\336\133\156\237\311\362\116\254\335\307"
 , (PRUint32)1023 }
 };
-static const NSSItem nss_builtins_items_165 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TURKTRUST Certificate Services Provider Root 1", (PRUint32)47 },
   { (void *)"\171\230\243\010\341\115\145\205\346\302\036\025\072\161\237\272"
 "\132\323\112\331"
 , (PRUint32)20 },
@@ -11165,17 +13374,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)186 },
   { (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_166 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TURKTRUST Certificate Services Provider Root 2", (PRUint32)47 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\276\061\077\060\075\006\003\125\004\003\014\066\124\303"
 "\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157"
@@ -11273,17 +13482,17 @@ static const NSSItem nss_builtins_items_
 "\334\024\303\054\212\122\233\226\214\122\146\075\206\026\213\107"
 "\270\121\011\214\352\175\315\210\162\263\140\063\261\360\012\104"
 "\357\017\365\011\067\210\044\016\054\153\040\072\242\372\021\362"
 "\100\065\234\104\150\143\073\254\063\157\143\274\054\273\362\322"
 "\313\166\175\175\210\330\035\310\005\035\156\274\224\251\146\214"
 "\167\161\307\372\221\372\057\121\236\351\071\122\266\347\004\102"
 , (PRUint32)1088 }
 };
-static const NSSItem nss_builtins_items_167 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"TURKTRUST Certificate Services Provider Root 2", (PRUint32)47 },
   { (void *)"\264\065\324\341\021\235\034\146\220\247\111\353\263\224\275\143"
 "\173\247\202\267"
 , (PRUint32)20 },
@@ -11305,17 +13514,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)193 },
   { (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_168 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"SwissSign Platinum CA - G2", (PRUint32)27 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\111\061\013\060\011\006\003\125\004\006\023\002\103\110\061"
 "\025\060\023\006\003\125\004\012\023\014\123\167\151\163\163\123"
@@ -11422,17 +13631,17 @@ static const NSSItem nss_builtins_items_
 "\221\313\062\233\023\075\076\175\222\122\065\254\222\224\242\323"
 "\030\302\174\307\352\257\166\005\026\335\147\047\302\176\034\007"
 "\042\041\363\100\012\033\064\007\104\023\302\204\152\216\337\031"
 "\132\277\177\353\035\342\032\070\321\134\257\107\222\153\200\265"
 "\060\245\311\215\330\253\061\201\037\337\302\146\067\323\223\251"
 "\205\206\171\145\322"
 , (PRUint32)1477 }
 };
-static const NSSItem nss_builtins_items_169 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"SwissSign Platinum CA - G2", (PRUint32)27 },
   { (void *)"\126\340\372\300\073\217\030\043\125\030\345\323\021\312\350\302"
 "\103\061\253\146"
 , (PRUint32)20 },
@@ -11446,17 +13655,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)75 },
   { (void *)"\002\010\116\262\000\147\014\003\135\117"
 , (PRUint32)10 },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_170 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"SwissSign Gold CA - G2", (PRUint32)23 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\103\110\061"
 "\025\060\023\006\003\125\004\012\023\014\123\167\151\163\163\123"
@@ -11562,17 +13771,17 @@ static const NSSItem nss_builtins_items_
 "\223\340\177\043\263\125\255\162\045\116\106\371\322\026\357\260"
 "\144\301\001\236\351\312\240\152\230\016\317\330\140\362\057\111"
 "\270\344\102\341\070\065\026\364\310\156\117\367\201\126\350\272"
 "\243\276\043\257\256\375\157\003\340\002\073\060\166\372\033\155"
 "\101\317\001\261\351\270\311\146\364\333\046\363\072\244\164\362"
 "\111\044\133\311\260\320\127\301\372\076\172\341\227\311"
 , (PRUint32)1470 }
 };
-static const NSSItem nss_builtins_items_171 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"SwissSign Gold CA - G2", (PRUint32)23 },
   { (void *)"\330\305\070\212\267\060\033\033\156\324\172\346\105\045\072\157"
 "\237\032\047\141"
 , (PRUint32)20 },
@@ -11586,17 +13795,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)71 },
   { (void *)"\002\011\000\273\100\034\103\365\136\117\260"
 , (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) }
 };
-static const NSSItem nss_builtins_items_172 [] = {
+static const NSSItem nss_builtins_items_198 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"SwissSign Silver CA - G2", (PRUint32)25 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\107\061\013\060\011\006\003\125\004\006\023\002\103\110\061"
 "\025\060\023\006\003\125\004\012\023\014\123\167\151\163\163\123"
@@ -11703,17 +13912,17 @@ static const NSSItem nss_builtins_items_
 "\204\010\146\322\304\066\175\247\076\020\374\210\340\324\200\345"
 "\000\275\252\363\116\006\243\172\152\371\142\162\343\011\117\353"
 "\233\016\001\043\361\237\273\174\334\334\154\021\227\045\262\362"
 "\264\143\024\322\006\052\147\214\203\365\316\352\007\330\232\152"
 "\036\354\344\012\273\052\114\353\011\140\071\316\312\142\330\056"
 "\156"
 , (PRUint32)1473 }
 };
-static const NSSItem nss_builtins_items_173 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"SwissSign Silver CA - G2", (PRUint32)25 },
   { (void *)"\233\252\345\237\126\356\041\313\103\132\276\045\223\337\247\360"
 "\100\321\035\313"
 , (PRUint32)20 },
@@ -11727,17 +13936,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)73 },
   { (void *)"\002\010\117\033\324\057\124\273\057\113"
 , (PRUint32)10 },
   { (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_174 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GeoTrust Primary Certification Authority", (PRUint32)41 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\130\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165"
@@ -11810,17 +14019,17 @@ static const NSSItem nss_builtins_items_
 "\061\267\371\264\161\200\022\110\231\162\163\132\131\123\301\143"
 "\122\063\355\247\311\322\071\002\160\372\340\261\102\146\051\252"
 "\233\121\355\060\124\042\024\137\331\253\035\301\344\224\360\370"
 "\365\053\367\352\312\170\106\326\270\221\375\246\015\053\032\024"
 "\001\076\200\360\102\240\225\007\136\155\315\314\113\244\105\215"
 "\253\022\350\263\336\132\345\240\174\350\017\042\035\132\351\131"
 , (PRUint32)896 }
 };
-static const NSSItem nss_builtins_items_175 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"GeoTrust Primary Certification Authority", (PRUint32)41 },
   { (void *)"\062\074\021\216\033\367\270\266\122\124\342\342\020\015\326\002"
 "\220\067\360\226"
 , (PRUint32)20 },
@@ -11836,17 +14045,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\030\254\265\152\375\151\266\025\072\143\154\257\332\372"
 "\304\241"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_176 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"thawte Primary Root CA", (PRUint32)23 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164"
@@ -11940,17 +14149,17 @@ static const NSSItem nss_builtins_items_
 "\263\041\030\204\345\066\000\353\143\040\231\271\351\376\063\004"
 "\273\101\310\301\002\371\104\143\040\236\201\316\102\323\326\077"
 "\054\166\323\143\234\131\335\217\246\341\016\240\056\101\367\056"
 "\225\107\317\274\375\063\363\366\013\141\176\176\221\053\201\107"
 "\302\047\060\356\247\020\135\067\217\134\071\053\344\004\360\173"
 "\215\126\214\150"
 , (PRUint32)1060 }
 };
-static const NSSItem nss_builtins_items_177 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"thawte Primary Root CA", (PRUint32)23 },
   { (void *)"\221\306\326\356\076\212\310\143\204\345\110\302\231\051\134\165"
 "\154\201\173\201"
 , (PRUint32)20 },
@@ -11971,17 +14180,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\064\116\325\127\040\325\355\354\111\364\057\316\067\333"
 "\053\155"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_178 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"VeriSign Class 3 Public Primary Certification Authority - G5", (PRUint32)61 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123"
@@ -12090,17 +14299,17 @@ static const NSSItem nss_builtins_items_
 "\341\364\021\157\020\265\225\374\347\102\005\062\333\316\235\121"
 "\136\050\266\236\205\323\133\357\245\175\105\100\162\216\267\016"
 "\153\016\006\373\063\065\110\161\270\235\047\213\304\145\137\015"
 "\206\166\234\104\172\366\225\134\366\135\062\010\063\244\124\266"
 "\030\077\150\134\362\102\112\205\070\124\203\137\321\350\054\362"
 "\254\021\326\250\355\143\152"
 , (PRUint32)1239 }
 };
-static const NSSItem nss_builtins_items_179 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"VeriSign Class 3 Public Primary Certification Authority - G5", (PRUint32)61 },
   { (void *)"\116\266\325\170\111\233\034\317\137\130\036\255\126\276\075\233"
 "\147\104\245\345"
 , (PRUint32)20 },
@@ -12123,17 +14332,17 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\030\332\321\236\046\175\350\273\112\041\130\315\314\153"
 "\073\112"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_180 [] = {
+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) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"SecureTrust CA", (PRUint32)15 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\110\061\0