fixup commit for branch 'BEONEX_0_9_BRANCH' BEONEX_0_9_BRANCH MOZILLA_1_1_BASE MOZILLA_1_1_RELEASE NMAKE_LAST_RITES
authorcvs2hg
Sun, 04 Aug 2002 21:19:56 +0000
branchBEONEX_0_9_BRANCH
changeset 3393 4d855a9ea29e8edfbaa04d85d76d960b1d307efe
parent 3134 3ed388b98ae439900dadb3a858342567ffe050a7
child 3394 e81ba1d2709b93396ccecf65cb32ed12781a5c72
child 3507 fefffc8e60096660b319f893d46f053ab276b6b4
child 3525 760fbcc1c8bf5c8d97350c434fc3a381b038bcb7
child 3526 eaa238db0dcc2d220cbf51a4ff7c4b7924af978f
child 3527 697571f764414d14c13ebf6b5de1e63fb9043746
push idunknown
push userunknown
push dateunknown
fixup commit for branch 'BEONEX_0_9_BRANCH'
security/coreconf/Darwin.mk
security/coreconf/HP-UXB.11.mk
security/coreconf/OpenBSD.mk
security/coreconf/config.mk
security/coreconf/rules.mk
security/dbm/Makefile
security/dbm/config/config.mk
security/dbm/include/Makefile
security/dbm/include/manifest.mn
security/dbm/manifest.mn
security/dbm/src/Makefile
security/dbm/src/config.mk
security/dbm/src/dirent.c
security/dbm/src/dirent.h
security/dbm/src/manifest.mn
security/dbm/tests/Makefile
security/nss/lib/certdb/certdb.c
security/nss/lib/certdb/crl.c
security/nss/lib/certdb/stanpcertdb.c
security/nss/lib/certhigh/certhigh.c
security/nss/lib/certhigh/ocsp.c
security/nss/lib/ckfw/builtins/certdata.c
security/nss/lib/ckfw/builtins/certdata.txt
security/nss/lib/ckfw/builtins/config.mk
security/nss/lib/ckfw/builtins/constants.c
security/nss/lib/dev/devm.h
security/nss/lib/dev/devslot.c
security/nss/lib/dev/devtoken.c
security/nss/lib/dev/devutil.c
security/nss/lib/freebl/Makefile
security/nss/lib/freebl/config.mk
security/nss/lib/freebl/unix_rand.c
security/nss/lib/nss/config.mk
security/nss/lib/nss/nss.h
security/nss/lib/nss/nssinit.c
security/nss/lib/pk11wrap/pk11cert.c
security/nss/lib/pk11wrap/pk11slot.c
security/nss/lib/pkcs12/p12d.c
security/nss/lib/pkcs12/p12t.h
security/nss/lib/pki/certificate.c
security/nss/lib/pki/pki3hack.c
security/nss/lib/pki/pkibase.c
security/nss/lib/softoken/lowpbe.c
security/nss/lib/softoken/pkcs11.c
security/nss/lib/softoken/softokn.rc
security/nss/lib/ssl/sslmutex.c
security/nss/lib/ssl/sslmutex.h
security/nss/lib/util/Makefile
security/nss/lib/util/portreg.c
security/nss/lib/util/portreg.h
security/nss/manifest.mn
--- a/security/coreconf/Darwin.mk
+++ b/security/coreconf/Darwin.mk
@@ -65,10 +65,12 @@ endif
 
 ARCH		= darwin
 
 # May override this with -bundle to create a loadable module.
 DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@)
 
 MKSHLIB		= $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
 DLL_SUFFIX	= dylib
+PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
+                sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@
 
 G++INCLUDES	= -I/usr/include/g++
--- a/security/coreconf/HP-UXB.11.mk
+++ b/security/coreconf/HP-UXB.11.mk
@@ -36,24 +36,32 @@ include $(CORE_DEPTH)/coreconf/HP-UX.mk
 
 ifdef USE_LONG_LONGS
 USE_HYBRID = 1
 endif
 
 ifndef NS_USE_GCC
     CCC                 = /opt/aCC/bin/aCC -ext
     ifeq ($(USE_64), 1)
-	OS_CFLAGS       +=  -Aa +e +DA2.0W +DS2.0 +DChpux
+	ifeq ($(OS_TEST), ia64)
+	    OS_CFLAGS	+= -Aa +e +p +DD64
+	else
+	    OS_CFLAGS	+= -Aa +e +DA2.0W +DS2.0 +DChpux
+	endif
 # Next line replaced by generic name handling in arch.mk
 #	COMPILER_TAG    = _64
     else
-	ifdef USE_HYBRID
-	    OS_CFLAGS 	+= -Aa +e +DA2.0 +DS2.0 
+	ifeq ($(OS_TEST), ia64)
+	    OS_CFLAGS	+= -Aa +e +p +DD32
 	else
-	    OS_CFLAGS   += +DAportable +DS2.0
+	    ifdef USE_HYBRID
+		OS_CFLAGS += -Aa +e +DA2.0 +DS2.0 
+	    else
+		OS_CFLAGS += +DAportable +DS2.0
+	    endif
 	endif
     endif
 else
     CCC = aCC
 endif
 
 OS_CFLAGS += -DHPUX11 
 OS_LIBS   += -lpthread -lm -lrt
new file mode 100644
--- /dev/null
+++ b/security/coreconf/OpenBSD.mk
@@ -0,0 +1,62 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable
+# instead of those above.  If you wish to allow use of your
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+# Config stuff for OpenBSD 
+#
+
+include $(CORE_DEPTH)/coreconf/UNIX.mk
+
+DEFAULT_COMPILER	= gcc
+CC			= gcc
+CCC			= g++
+RANLIB			= ranlib
+
+CPU_ARCH		:= $(shell uname -p)
+ifeq ($(CPU_ARCH),i386)
+OS_REL_CFLAGS		= -Di386
+CPU_ARCH		= x86
+endif
+
+DLL_SUFFIX		= so.1.0
+
+OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
+
+OS_LIBS			= 
+
+ARCH			= openbsd
+
+DSO_CFLAGS		= -fPIC -DPIC
+DSO_LDOPTS		= -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+DSO_LDFLAGS		=
+
+MKSHLIB			= $(CC) $(DSO_LDOPTS)
+
--- a/security/coreconf/config.mk
+++ b/security/coreconf/config.mk
@@ -53,17 +53,17 @@ endif
 # [3.0] Master "Core Components" <architecture>-specific macros       #
 #       (dependent upon <architecture> tags)                          #
 #                                                                     #
 #       We are moving towards just having a $(OS_TARGET).mk file      #
 #       as opposed to multiple $(OS_TARGET)$(OS_RELEASE).mk files,    #
 #       one for each OS release.                                      #
 #######################################################################
 
-TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS
+TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD
 
 ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
 include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
 else
 include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
 endif
 
 #######################################################################
--- a/security/coreconf/rules.mk
+++ b/security/coreconf/rules.mk
@@ -359,16 +359,21 @@ ifdef XP_OS2_VACPP
 	$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $@.def
 else
 	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
 endif
 	chmod +x $@
 ifeq ($(OS_TARGET),OpenVMS)
 	@echo "`translate $@`" > $(@:$(DLL_SUFFIX)=vms)
 endif
+ifeq ($(OS_TARGET),Darwin)
+ifdef MAPFILE
+	nmedit -s $(MAPFILE) $@
+endif
+endif
 endif
 endif
 
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 $(RES): $(RESNAME)
 	@$(MAKE_OBJDIR)
 # The resource compiler does not understand the -U option.
 	$(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
deleted file mode 100644
--- a/security/dbm/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-#! gmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY).   #
-#######################################################################
-
-include manifest.mn
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL)          #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/config.mk
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL)       #
-#######################################################################
-
-
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-
-
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL)                              #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
-
-
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-
-coreconf_hack:
-	cd ../coreconf; gmake
-	gmake import
-
-RelEng_bld: coreconf_hack
-	gmake
deleted file mode 100644
--- a/security/dbm/config/config.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#! gmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-#
-# These macros are defined by mozilla's configure script.
-# We define them manually here.
-#
-
-DEFINES += -DSTDC_HEADERS -DHAVE_STRERROR
-
-#
-# Most platforms have snprintf, so it's simpler to list the exceptions.
-#
-HAVE_SNPRINTF = 1
-#
-# OSF1 V4.0D doesn't have snprintf but V5.0A does.
-#
-ifeq ($(OS_TARGET)$(OS_RELEASE),OSF1V4.0D)
-HAVE_SNPRINTF =
-endif
-ifdef HAVE_SNPRINTF
-DEFINES += -DHAVE_SNPRINTF
-endif
-
-ifeq (,$(filter-out IRIX Linux,$(OS_TARGET)))
-DEFINES += -DHAVE_SYS_CDEFS_H
-endif
-
-ifeq (,$(filter-out DGUX NCR ReliantUNIX SCO_SV SCOOS UNIXWARE,$(OS_TARGET)))
-DEFINES += -DHAVE_SYS_BYTEORDER_H
-endif
-
-#
-# None of the platforms that we are interested in need to
-# define HAVE_MEMORY_H.
-#
deleted file mode 100644
--- a/security/dbm/include/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-#! gmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY).   #
-#######################################################################
-
-include manifest.mn
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL)          #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/config.mk
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL)       #
-#######################################################################
-
-
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-
-
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL)                              #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
-
-
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-
-
-
deleted file mode 100644
--- a/security/dbm/include/manifest.mn
+++ /dev/null
@@ -1,57 +0,0 @@
-#! gmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-CORE_DEPTH = ../..
-
-VPATH  = $(CORE_DEPTH)/../dbm/include
-
-MODULE = dbm
-
-EXPORTS =	nsres.h   \
-		cdefs.h   \
-		mcom_db.h \
-		ncompat.h \
-		winfile.h \
-		$(NULL)
-
-PRIVATE_EXPORTS =	hsearch.h \
-			page.h    \
-			extern.h  \
-			ndbm.h    \
-			queue.h   \
-			hash.h    \
-			mpool.h   \
-			search.h  \
-			$(NULL)
-
deleted file mode 100644
--- a/security/dbm/manifest.mn
+++ /dev/null
@@ -1,45 +0,0 @@
-#! gmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-CORE_DEPTH = ..
-
-MODULE = dbm
-
-IMPORTS = nspr20/v4.1.2
-
-RELEASE = dbm
-
-DIRS =  include \
-        src     \
-	$(NULL)
deleted file mode 100644
--- a/security/dbm/src/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-#! gmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY).   #
-#######################################################################
-
-include manifest.mn
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL)          #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/config.mk
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL)       #
-#######################################################################
-
-include $(CORE_DEPTH)/dbm/config/config.mk
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-
-include config.mk
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL)                              #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
-
-
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-
-
-
deleted file mode 100644
--- a/security/dbm/src/config.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#! gmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG)
-
-INCLUDES += -I$(CORE_DEPTH)/../dbm/include
-
-#
-#  Currently, override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PURE_LIBRARY   =
-PROGRAM        =
-
-ifdef SHARED_LIBRARY
-	ifeq (,$(filter-out WINNT WIN95 WINCE,$(OS_TARGET))) # list omits WIN16
-		DLLBASE=/BASE:0x30000000
-		RES=$(OBJDIR)/dbm.res
-		RESNAME=../include/dbm.rc
-	endif
-	ifeq ($(DLL_SUFFIX),dll)
-		DEFINES += -D_DLL
-	endif
-endif
-
-ifeq ($(OS_TARGET),AIX)
-	OS_LIBS += -lc_r
-endif
deleted file mode 100644
--- a/security/dbm/src/dirent.c
+++ /dev/null
@@ -1,348 +0,0 @@
-#ifdef OS2
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <dirent.h>
-#include <errno.h>
-
-/*#ifndef __EMX__ 
-#include <libx.h>
-#endif */
-
-#define INCL_DOSFILEMGR
-#define INCL_DOSERRORS
-#include <os2.h>
-
-#if OS2 >= 2
-# define FFBUF	FILEFINDBUF3
-# define Word	ULONG
-  /*
-   * LS20 recommends a request count of 100, but according to the
-   * APAR text it does not lead to missing files, just to funny
-   * numbers of returned entries.
-   *
-   * LS30 HPFS386 requires a count greater than 2, or some files
-   * are missing (those starting with a character less that '.').
-   *
-   * Novell looses entries which overflow the buffer. In previous
-   * versions of dirent2, this could have lead to missing files
-   * when the average length of 100 directory entries was 40 bytes
-   * or more (quite unlikely for files on a Novell server).
-   *
-   * Conclusion: Make sure that the entries all fit into the buffer
-   * and that the buffer is large enough for more than 2 entries
-   * (each entry is at most 300 bytes long). And ignore the LS20
-   * effect.
-   */
-# define Count	25
-# define BufSz	(25 * (sizeof(FILEFINDBUF3)+1))
-#else
-# define FFBUF	FILEFINDBUF
-# define Word	USHORT
-# define BufSz	1024
-# define Count	3
-#endif
-
-#if defined(__IBMC__) || defined(__IBMCPP__)
-  #define error(rc) _doserrno = rc, errno = EOS2ERR
-#elif defined(MICROSOFT)
-  #define error(rc) _doserrno = rc, errno = 255
-#else
-  #define error(rc) errno = 255
-#endif
-
-struct _dirdescr {
-	HDIR		handle;		/* DosFindFirst handle */
-	char		fstype;		/* filesystem type */
-	Word		count;		/* valid entries in <ffbuf> */
-	long		number;		/* absolute number of next entry */
-	int		index;		/* relative number of next entry */
-	FFBUF *		next;		/* pointer to next entry */
-	char		name[MAXPATHLEN+3]; /* directory name */
-	unsigned	attrmask;	/* attribute mask for seekdir */
-	struct dirent	entry;		/* buffer for directory entry */
-	BYTE		ffbuf[BufSz];
-};
-
-/*
- * Return first char of filesystem type, or 0 if unknown.
- */
-static char
-getFSType(const char *path)
-{
-	static char cache[1+26];
-	char drive[3], info[512];
-	Word unit, infolen;
-	char r;
-
-	if (isalpha(path[0]) && path[1] == ':') {
-		unit = toupper(path[0]) - '@';
-		path += 2;
-	} else {
-		ULONG driveMap;
-#if OS2 >= 2
-		if (DosQueryCurrentDisk(&unit, &driveMap))
-#else
-		if (DosQCurDisk(&unit, &driveMap))
-#endif
-			return 0;
-	}
-
-	if ((path[0] == '\\' || path[0] == '/')
-	 && (path[1] == '\\' || path[1] == '/'))
-		return 0;
-
-	if (cache [unit])
-		return cache [unit];
-
-	drive[0] = '@' + unit;
-	drive[1] = ':';
-	drive[2] = '\0';
-	infolen = sizeof info;
-#if OS2 >= 2
-	if (DosQueryFSAttach(drive, 0, FSAIL_QUERYNAME, (PVOID)info, &infolen))
-		return 0;
-	if (infolen >= sizeof(FSQBUFFER2)) {
-		FSQBUFFER2 *p = (FSQBUFFER2 *)info;
-		r = p->szFSDName[p->cbName];
-	} else
-#else
-	if (DosQFSAttach((PSZ)drive, 0, FSAIL_QUERYNAME, (PVOID)info, &infolen, 0))
-		return 0;
-	if (infolen >= 9) {
-		char *p = info + sizeof(USHORT);
-		p += sizeof(USHORT) + *(USHORT *)p + 1 + sizeof(USHORT);
-		r = *p;
-	} else
-#endif
-		r = 0;
-	return cache [unit] = r;
-}
-
-char *
-abs_path(const char *name, char *buffer, int len)
-{
-	char buf[4];
-	if (isalpha(name[0]) && name[1] == ':' && name[2] == '\0') {
-		buf[0] = name[0];
-		buf[1] = name[1];
-		buf[2] = '.';
-		buf[3] = '\0';
-		name = buf;
-	}
-#if OS2 >= 2
-	if (DosQueryPathInfo((PSZ)name, FIL_QUERYFULLNAME, buffer, len))
-#else
-	if (DosQPathInfo((PSZ)name, FIL_QUERYFULLNAME, (PBYTE)buffer, len, 0L))
-#endif
-		return NULL;
-	return buffer;
-}
-
-DIR *
-openxdir(const char *path, unsigned att_mask)
-{
-	DIR *dir;
-	char name[MAXPATHLEN+3];
-	Word rc;
-
-	dir = malloc(sizeof(DIR));
-	if (dir == NULL) {
-		errno = ENOMEM;
-		return NULL;
-	}
-
-	strncpy(name, path, MAXPATHLEN);
-	name[MAXPATHLEN] = '\0';
-	switch (name[strlen(name)-1]) {
-	default:
-		strcat(name, "\\");
-	case '\\':
-	case '/':
-	case ':':
-		;
-	}
-	strcat(name, ".");
-	if (!abs_path(name, dir->name, MAXPATHLEN+1))
-		strcpy(dir->name, name);
-	if (dir->name[strlen(dir->name)-1] == '\\')
-		strcat(dir->name, "*");
-	else
-		strcat(dir->name, "\\*");
-
-	dir->fstype = getFSType(dir->name);
-	dir->attrmask = att_mask | A_DIR;
-
-	dir->handle = HDIR_CREATE;
-	dir->count = 100;
-#if OS2 >= 2
-	rc = DosFindFirst(dir->name, &dir->handle, dir->attrmask,
-		dir->ffbuf, sizeof dir->ffbuf, &dir->count, FIL_STANDARD);
-#else
-	rc = DosFindFirst((PSZ)dir->name, &dir->handle, dir->attrmask,
-		(PFILEFINDBUF)dir->ffbuf, sizeof dir->ffbuf, &dir->count, 0);
-#endif
-	switch (rc) {
-	default:
-		free(dir);
-		error(rc);
-		return NULL;
-	case NO_ERROR:
-	case ERROR_NO_MORE_FILES:
-		;
-	}
-
-	dir->number = 0;
-	dir->index = 0;
-	dir->next = (FFBUF *)dir->ffbuf;
-
-	return (DIR *)dir;
-}
-
-DIR *
-opendir(const char *pathname)
-{
-	return openxdir(pathname, 0);
-}
-
-struct dirent *
-readdir(DIR *dir)
-{
-	static int dummy_ino = 2;
-
-	if (dir->index == dir->count) {
-		Word rc;
-		dir->count = 100;
-#if OS2 >= 2
-		rc = DosFindNext(dir->handle, dir->ffbuf,
-			sizeof dir->ffbuf, &dir->count);
-#else
-		rc = DosFindNext(dir->handle, (PFILEFINDBUF)dir->ffbuf,
-			sizeof dir->ffbuf, &dir->count);
-#endif
-		if (rc) {
-			error(rc);
-			return NULL;
-		}
-
-		dir->index = 0;
-		dir->next = (FFBUF *)dir->ffbuf;
-	}
-
-	if (dir->index == dir->count)
-		return NULL;
-
-	memcpy(dir->entry.d_name, dir->next->achName, dir->next->cchName);
-	dir->entry.d_name[dir->next->cchName] = '\0';
-	dir->entry.d_ino = dummy_ino++;
-	dir->entry.d_reclen = dir->next->cchName;
-	dir->entry.d_namlen = dir->next->cchName;
-	dir->entry.d_size = dir->next->cbFile;
-	dir->entry.d_attribute = dir->next->attrFile;
-	dir->entry.d_time = *(USHORT *)&dir->next->ftimeLastWrite;
-	dir->entry.d_date = *(USHORT *)&dir->next->fdateLastWrite;
-
-	switch (dir->fstype) {
-	case 'F': /* FAT */
-	case 'C': /* CDFS */
-		if (dir->next->attrFile & FILE_DIRECTORY)
-			strupr(dir->entry.d_name);
-		else
-			strlwr(dir->entry.d_name);
-	}
-
-#if OS2 >= 2
-	dir->next = (FFBUF *)((BYTE *)dir->next + dir->next->oNextEntryOffset);
-#else
-	dir->next = (FFBUF *)((BYTE *)dir->next->achName + dir->next->cchName + 1);
-#endif
-	++dir->number;
-	++dir->index;
-
-	return &dir->entry;
-}
-
-long
-telldir(DIR *dir)
-{
-	return dir->number;
-}
-
-void
-seekdir(DIR *dir, long off)
-{
-	if (dir->number > off) {
-		char name[MAXPATHLEN+2];
-		Word rc;
-
-		DosFindClose(dir->handle);
-
-		strcpy(name, dir->name);
-		strcat(name, "*");
-
-		dir->handle = HDIR_CREATE;
-		dir->count = 32767;
-#if OS2 >= 2
-		rc = DosFindFirst(name, &dir->handle, dir->attrmask,
-			dir->ffbuf, sizeof dir->ffbuf, &dir->count, FIL_STANDARD);
-#else
-		rc = DosFindFirst((PSZ)name, &dir->handle, dir->attrmask,
-			(PFILEFINDBUF)dir->ffbuf, sizeof dir->ffbuf, &dir->count, 0);
-#endif
-		switch (rc) {
-		default:
-			error(rc);
-			return;
-		case NO_ERROR:
-		case ERROR_NO_MORE_FILES:
-			;
-		}
-
-		dir->number = 0;
-		dir->index = 0;
-		dir->next = (FFBUF *)dir->ffbuf;
-	}
-
-	while (dir->number < off && readdir(dir))
-		;
-}
-
-void
-closedir(DIR *dir)
-{
-	DosFindClose(dir->handle);
-	free(dir);
-}
-
-/*****************************************************************************/
-
-#ifdef TEST
-
-main(int argc, char **argv)
-{
-	int i;
-	DIR *dir;
-	struct dirent *ep;
-
-	for (i = 1; i < argc; ++i) {
-		dir = opendir(argv[i]);
-		if (!dir)
-			continue;
-		while (ep = readdir(dir))
-			if (strchr("\\/:", argv[i] [strlen(argv[i]) - 1]))
-				printf("%s%s\n", argv[i], ep->d_name);
-			else
-				printf("%s/%s\n", argv[i], ep->d_name);
-		closedir(dir);
-	}
-
-	return 0;
-}
-
-#endif
-
-#endif /* OS2 */
-
deleted file mode 100644
--- a/security/dbm/src/dirent.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#ifndef __DIRENT_H__
-#define __DIRENT_H__
-/*
- * @(#)msd_dir.h 1.4 87/11/06   Public Domain.
- *
- *  A public domain implementation of BSD directory routines for
- *  MS-DOS.  Written by Michael Rendell ({uunet,utai}michael@garfield),
- *  August 1897
- *
- *  Extended by Peter Lim (lim@mullian.oz) to overcome some MS DOS quirks
- *  and returns 2 more pieces of information - file size & attribute.
- *  Plus a little reshuffling of some #define's positions    December 1987
- *
- *  Some modifications by Martin Junius                      02-14-89
- *
- *	AK900712
- *	AK910410	abs_path - make absolute path
- *
- */
-
-#ifdef __EMX__
-#include <sys/param.h>
-#else
-#if defined(__IBMC__) || defined(__IBMCPP__) || defined(XP_W32_MSVC)
-#include <stdio.h>
-#ifdef MAXPATHLEN
-	#undef MAXPATHLEN
-#endif
-#define MAXPATHLEN (FILENAME_MAX*4)
-#define MAXNAMLEN FILENAME_MAX
-
-#else
-#include <param.h>
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* attribute stuff */
-#ifndef A_RONLY
-# define A_RONLY   0x01
-# define A_HIDDEN  0x02
-# define A_SYSTEM  0x04
-# define A_LABEL   0x08
-# define A_DIR     0x10
-# define A_ARCHIVE 0x20
-#endif
-
-struct dirent {
-#if defined(OS2) || defined(WIN32)        /* use the layout of EMX to avoid trouble */
-    int            d_ino;                 /* Dummy */
-    int            d_reclen;		  /* Dummy, same as d_namlen */
-    int            d_namlen;              /* length of name */
-    char           d_name[MAXNAMLEN + 1];
-    unsigned long  d_size;
-    unsigned short d_attribute;           /* attributes (see above) */
-    unsigned short d_time;                /* modification time */
-    unsigned short d_date;                /* modification date */
-#else
-    char	   d_name[MAXNAMLEN + 1]; /* garentee null termination */
-    char	   d_attribute;		  /* .. extension .. */
-    unsigned long  d_size;		  /* .. extension .. */
-#endif
-};
-
-typedef struct _dirdescr DIR;
-/* the structs do not have to be defined here */
-
-extern DIR		*opendir(const char *);
-extern DIR		*openxdir(const char *, unsigned);
-extern struct dirent	*readdir(DIR *);
-extern void		seekdir(DIR *, long);
-extern long		telldir(DIR *);
-extern void 		closedir(DIR *);
-#define			rewinddir(dirp) seekdir(dirp, 0L)
-
-extern char *		abs_path(const char *name, char *buffer, int len);
-
-#ifndef S_IFMT
-#define S_IFMT ( S_IFDIR | S_IFREG )
-#endif
-
-#ifndef S_ISDIR
-#define S_ISDIR( m )                    (((m) & S_IFMT) == S_IFDIR)
-#endif
-
-#ifndef S_ISREG
-#define S_ISREG( m )                    (((m) & S_IFMT) == S_IFREG)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
deleted file mode 100644
--- a/security/dbm/src/manifest.mn
+++ /dev/null
@@ -1,61 +0,0 @@
-#! gmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-CORE_DEPTH = ../..
-
-VPATH  = $(CORE_DEPTH)/../dbm/src
-
-MODULE = dbm
-
-#
-# memmove.c, snprintf.c, and strerror.c are not in CSRCS because
-# the Standard C Library has memmove and strerror and DBM is not
-# using snprintf.
-#
-
-CSRCS = db.c	   \
-	h_bigkey.c \
-	h_func.c   \
-	h_log2.c   \
-	h_page.c   \
-	hash.c	   \
-	hash_buf.c \
-	hsearch.c  \
-	mktemp.c   \
-	ndbm.c	   \
-	nsres.c	   \
-	dirent.c	   \
-	$(NULL)
-
-LIBRARY_NAME = dbm
deleted file mode 100644
--- a/security/dbm/tests/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! gmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-DEPTH		= ../..
-CORE_DEPTH	= ../..
-
-VPATH		= $(CORE_DEPTH)/../dbm/tests
-
-MODULE		= dbm
-
-CSRCS		= lots.c
-
-PROGRAM		= lots
-
-include $(DEPTH)/coreconf/config.mk
-
-include $(DEPTH)/dbm/config/config.mk
-
-ifeq (,$(filter-out WIN%,$(OS_TARGET))) 
-LIBDBM		= ../src/$(PLATFORM)/dbm$(STATIC_LIB_SUFFIX)
-else
-LIBDBM		= ../src/$(PLATFORM)/libdbm$(STATIC_LIB_SUFFIX)
-endif
-
-INCLUDES	+= -I$(CORE_DEPTH)/../dbm/include
-
-LDFLAGS		= $(LDOPTS) $(LIBDBM)
-
-include $(DEPTH)/coreconf/rules.mk
-
-lots.pure: lots
-	purify $(CC) -o lots.pure $(CFLAGS) $(OBJS) $(MYLIBS)
-
-crash: crash.o $(MYLIBS)
-	$(CC) -o crash $(CFLAGS) $^
-
-crash.pure: crash.o $(MYLIBS)
-	purify $(CC) -o crash.pure $(CFLAGS) $^
-
--- a/security/nss/lib/certdb/certdb.c
+++ b/security/nss/lib/certdb/certdb.c
@@ -54,16 +54,17 @@
 #include "sechash.h"
 #include "prlong.h"
 #include "certxutl.h"
 #include "portreg.h"
 #include "secerr.h"
 #include "sslerr.h"
 #include "nsslocks.h"
 #include "pk11func.h"
+#include "xconst.h"   /* for  CERT_DecodeAltNameExtension */
 
 #ifndef NSS_3_4_CODE
 #define NSS_3_4_CODE
 #endif /* NSS_3_4_CODE */
 #include "pki.h"
 #include "pki3hack.h"
 
 /*
@@ -1231,117 +1232,237 @@ CERT_AddOKDomainName(CERTCertificate *ce
     sec_lower_string(domainOK->name);
 
     /* put at head of list. */
     domainOK->next = cert->domainOK;
     cert->domainOK = domainOK;
     return SECSuccess;
 }
 
+/* returns SECSuccess if hn matches pattern cn,
+** returns SECFailure with SSL_ERROR_BAD_CERT_DOMAIN if no match,
+** returns SECFailure with some other error code if another error occurs.
+**
+** may modify cn, so caller must pass a modifiable copy.
+*/
+static SECStatus
+cert_TestHostName(char * cn, const char * hn)
+{
+    char * hndomain;
+    int    regvalid;
+
+    if ((hndomain = PORT_Strchr(hn, '.')) == NULL) {
+	/* No domain in URI host name */
+	char * cndomain;
+	if ((cndomain = PORT_Strchr(cn, '.')) != NULL &&
+	    (cndomain - cn) > 0) {
+	    /* there is a domain in the cn string, so chop it off */
+	    *cndomain = '\0';
+	}
+    }
+
+    regvalid = PORT_RegExpValid(cn);
+    if (regvalid != NON_SXP) {
+	SECStatus rv;
+	/* cn is a regular expression, try to match the shexp */
+	int match = PORT_RegExpCaseSearch(hn, cn);
+
+	if ( match == 0 ) {
+	    rv = SECSuccess;
+	} else {
+	    PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN);
+	    rv = SECFailure;
+	}
+	return rv;
+    } 
+    /* cn is not a regular expression */
+
+    /* compare entire hn with cert name */
+    if (PORT_Strcasecmp(hn, cn) == 0) {
+	return SECSuccess;
+    }
+	    
+    if ( hndomain ) {
+	/* compare just domain name with cert name */
+	if ( PORT_Strcasecmp(hndomain+1, cn) == 0 ) {
+	    return SECSuccess;
+	}
+    }
+
+    PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN);
+    return SECFailure;
+}
+
+
+SECStatus
+cert_VerifySubjectAltName(CERTCertificate *cert, const char *hn)
+{
+    PRArenaPool *     arena          = NULL;
+    CERTGeneralName * nameList       = NULL;
+    CERTGeneralName * current;
+    char *            cn;
+    int               cnBufLen;
+    unsigned int      hnLen;
+    int               DNSextCount    = 0;
+    int               IPextCount     = 0;
+    PRBool            isIPaddr;
+    SECStatus         rv             = SECFailure;
+    SECItem           subAltName;
+    PRNetAddr         netAddr;
+    char              cnbuf[128];
+
+    subAltName.data = NULL;
+    hnLen    = strlen(hn);
+    cn       = cnbuf;
+    cnBufLen = sizeof cnbuf;
+
+    rv = CERT_FindCertExtension(cert, SEC_OID_X509_SUBJECT_ALT_NAME, 
+				&subAltName);
+    if (rv != SECSuccess) {
+	goto finish;
+    }
+    isIPaddr = (PR_SUCCESS == PR_StringToNetAddr(hn, &netAddr));
+    rv = SECFailure;
+    arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+    if (!arena) 
+	goto finish;
+
+    nameList = current = CERT_DecodeAltNameExtension(arena, &subAltName);
+    if (!current)
+    	goto finish;
+
+    do {
+	switch (current->type) {
+	case certDNSName:
+	    if (!isIPaddr) {
+		/* DNS name current->name.other.data is not null terminated.
+		** so must copy it.  
+		*/
+		int cnLen = current->name.other.len;
+		if (cnLen + 1 > cnBufLen) {
+		    cnBufLen = cnLen + 1;
+		    cn = (char *)PORT_ArenaAlloc(arena, cnBufLen);
+		    if (!cn)
+			goto finish;
+		}
+		PORT_Memcpy(cn, current->name.other.data, 
+		                current->name.other.len);
+		cn[cnLen] = 0;
+		rv = cert_TestHostName(cn ,hn);
+		if (rv == SECSuccess)
+		    goto finish;
+	    }
+	    DNSextCount++;
+	    break;
+	case certIPAddress:
+	    if (isIPaddr) {
+		int match = 0;
+		PRIPv6Addr v6Addr;
+		if (current->name.other.len == 4 &&         /* IP v4 address */
+		    netAddr.inet.family == PR_AF_INET) {
+		    match = !memcmp(&netAddr.inet.ip, 
+		                    current->name.other.data, 4);
+		} else if (current->name.other.len == 16 && /* IP v6 address */
+		    netAddr.ipv6.family == PR_AF_INET6) {
+		    match = !memcmp(&netAddr.ipv6.ip,
+		                     current->name.other.data, 16);
+		} else if (current->name.other.len == 16 && /* IP v6 address */
+		    netAddr.inet.family == PR_AF_INET) {
+		    /* convert netAddr to ipv6, then compare. */
+		    /* ipv4 must be in Network Byte Order on input. */
+		    PR_ConvertIPv4AddrToIPv6(netAddr.inet.ip, &v6Addr);
+		    match = !memcmp(&v6Addr, current->name.other.data, 16);
+		} else if (current->name.other.len == 4 &&  /* IP v4 address */
+		    netAddr.inet.family == PR_AF_INET6) {
+		    /* convert netAddr to ipv6, then compare. */
+		    PRUint32 ipv4 = (current->name.other.data[0] << 24) |
+		                    (current->name.other.data[1] << 16) |
+				    (current->name.other.data[2] <<  8) |
+				     current->name.other.data[3];
+		    /* ipv4 must be in Network Byte Order on input. */
+		    PR_ConvertIPv4AddrToIPv6(PR_htonl(ipv4), &v6Addr);
+		    match = !memcmp(&netAddr.ipv6.ip, &v6Addr, 16);
+		} 
+		if (match) {
+		    rv = SECSuccess;
+		    goto finish;
+		}
+	    }
+	    IPextCount++;
+	    break;
+	default:
+	    break;
+	}
+	current = cert_get_next_general_name(current);
+    } while (current != nameList);
+
+    if ((!isIPaddr && !DNSextCount) || (isIPaddr && !IPextCount)) {
+	/* no relevant value in the extension was found. */
+	PORT_SetError(SEC_ERROR_EXTENSION_NOT_FOUND);
+    } else {
+	PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN);
+    }
+    rv = SECFailure;
+
+finish:
+
+    /* Don't free nameList, it's part of the arena. */
+    if (arena) {
+	PORT_FreeArena(arena, PR_FALSE);
+    }
+
+    if (subAltName.data) {
+	SECITEM_FreeItem(&subAltName, PR_FALSE);
+    }
+
+    return rv;
+}
+
+
 /* Make sure that the name of the host we are connecting to matches the
  * name that is incoded in the common-name component of the certificate
  * that they are using.
  */
 SECStatus
 CERT_VerifyCertName(CERTCertificate *cert, const char *hn)
 {
     char *    cn;
-    char *    domain;
-    char *    hndomain;
-    char *    hostname;
-    int       regvalid;
-    int       match;
     SECStatus rv;
     CERTOKDomainName *domainOK;
 
     if (!hn || !strlen(hn)) {
     	PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	return SECFailure;
     }
 
-    hostname = PORT_Strdup(hn);
-    if ( hostname == NULL ) {
-	return(SECFailure);
-    }
-    sec_lower_string(hostname);
-
     /* if the name is one that the user has already approved, it's OK. */
     for (domainOK = cert->domainOK; domainOK; domainOK = domainOK->next) {
-	if (0 == PORT_Strcmp(hostname, domainOK->name)) {
-	    PORT_Free(hostname);
+	if (0 == PORT_Strcasecmp(hn, domainOK->name)) {
 	    return SECSuccess;
     	}
     }
 
+    /* Per RFC 2818, if the SubjectAltName extension is present, it must
+    ** be used as the cert's identity.
+    */
+    rv = cert_VerifySubjectAltName(cert, hn);
+    if (rv == SECSuccess || PORT_GetError() != SEC_ERROR_EXTENSION_NOT_FOUND)
+    	return rv;
+
     /* try the cert extension first, then the common name */
     cn = CERT_FindNSStringExtension(cert, SEC_OID_NS_CERT_EXT_SSL_SERVER_NAME);
-    if ( cn == NULL ) {
+    if ( !cn ) {
 	cn = CERT_GetCommonName(&cert->subject);
     }
-    
-    sec_lower_string(cn);
-
     if ( cn ) {
-	if ( ( hndomain = PORT_Strchr(hostname, '.') ) == NULL ) {
-	    /* No domain in server name */
-	    if ( ( domain = PORT_Strchr(cn, '.') ) != NULL ) {
-		/* there is a domain in the cn string, so chop it off */
-		*domain = '\0';
-	    }
-	}
-
-	regvalid = PORT_RegExpValid(cn);
-	
-	if ( regvalid == NON_SXP ) {
-	    /* compare entire hostname with cert name */
-	    if ( PORT_Strcmp(hostname, cn) == 0 ) {
-		rv = SECSuccess;
-		goto done;
-	    }
-	    
-	    if ( hndomain ) {
-		/* compare just domain name with cert name */
-		if ( PORT_Strcmp(hndomain+1, cn) == 0 ) {
-		    rv = SECSuccess;
-		    goto done;
-		}
-	    }
-
-	    PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN);
-	    rv = SECFailure;
-	    goto done;
-	    
-	} else {
-	    /* try to match the shexp */
-	    match = PORT_RegExpCaseSearch(hostname, cn);
-
-	    if ( match == 0 ) {
-		rv = SECSuccess;
-	    } else {
-		PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN);
-		rv = SECFailure;
-	    }
-	    goto done;
-	}
-    }
-
-    PORT_SetError(SEC_ERROR_NO_MEMORY);
-    rv = SECFailure;
-
-done:
-    /* free the common name */
-    if ( cn ) {
+	rv = cert_TestHostName(cn, hn);
 	PORT_Free(cn);
-    }
-    
-    if ( hostname ) {
-	PORT_Free(hostname);
-    }
-    
-    return(rv);
+    } else 
+	PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN);
+    return rv;
 }
 
 PRBool
 CERT_CompareCerts(CERTCertificate *c1, CERTCertificate *c2)
 {
     SECComparison comp;
     
     comp = SECITEM_CompareItem(&c1->derCert, &c2->derCert);
--- a/security/nss/lib/certdb/crl.c
+++ b/security/nss/lib/certdb/crl.c
@@ -234,20 +234,16 @@ SECStatus cert_check_crl_version (CERTCr
 		PORT_SetError (SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION);
 		return (SECFailure);
 	    }
 	}
     }
 
 	
     if (crl->entries == NULL) {
-	if (hasCriticalExten == PR_FALSE && version == SEC_CRL_VERSION_2) {
-	    PORT_SetError (SEC_ERROR_BAD_DER);
-	    return (SECFailure);
-	}
         return (SECSuccess);
     }
     /* Look in the crl entry extensions.  If there is a critical extension,
        then the crl version must be v2; otherwise, it should be v1.
      */
     entries = crl->entries;
     while (*entries) {
 	entry = *entries;
--- a/security/nss/lib/certdb/stanpcertdb.c
+++ b/security/nss/lib/certdb/stanpcertdb.c
@@ -176,16 +176,19 @@ SECStatus
     if (!permInstance) {
 	return SECFailure;
     }
     nssPKIObject_AddInstance(&c->object, permInstance);
     nssTrustDomain_AddCertsToCache(STAN_GetDefaultTrustDomain(), &c, 1);
     /* reset the CERTCertificate fields */
     cert->nssCertificate = NULL;
     cert = STAN_GetCERTCertificate(c); /* will return same pointer */
+    if (!cert) {
+        return SECFailure;
+    }
     cert->istemp = PR_FALSE;
     cert->isperm = PR_TRUE;
     if (!trust) {
 	return PR_SUCCESS;
     }
     return (STAN_ChangeCertTrust(cert, trust) == PR_SUCCESS) ? 
 							SECSuccess: SECFailure;
 }
@@ -238,16 +241,19 @@ CERTCertificate *
 	               derCert->len, derCert->data);
     } else {
 	NSSITEM_FROM_SECITEM(&c->encoding, derCert);
     }
     /* Forces a decoding of the cert in order to obtain the parts used
      * below
      */
     cc = STAN_GetCERTCertificate(c);
+    if (!cc) {
+        return NULL;
+    }
     nssItem_Create(c->object.arena, 
                    &c->issuer, cc->derIssuer.len, cc->derIssuer.data);
     nssItem_Create(c->object.arena, 
                    &c->subject, cc->derSubject.len, cc->derSubject.data);
     if (PR_TRUE) {
 	/* CERTCertificate stores serial numbers decoded.  I need the DER
 	* here.  sigh.
 	*/
@@ -281,16 +287,19 @@ CERTCertificate *
                                                                    &c->issuer,
                                                                    &c->serial);
     /* destroy the copy */
     NSSCertificate_Destroy(c);
     if (tempCert) {
 	/* and use the "official" entry */
 	c = tempCert;
 	cc = STAN_GetCERTCertificate(c);
+        if (!cc) {
+            return NULL;
+        }
     } else {
 	return NULL;
     }
     cc->istemp = PR_TRUE;
     cc->isperm = PR_FALSE;
     return cc;
 loser:
     nssPKIObject_Destroy(&c->object);
@@ -349,20 +358,26 @@ CERT_FindCertByName(CERTCertDBHandle *ha
     cc = STAN_GetDefaultCryptoContext();
     ct = NSSCryptoContext_FindBestCertificateBySubject(cc, &subject, 
                                                        NULL, &usage, NULL);
     cp = NSSTrustDomain_FindBestCertificateBySubject(handle, &subject, 
                                                      NULL, &usage, NULL);
     c = get_best_temp_or_perm(ct, cp);
     if (ct) {
 	CERTCertificate *cert = STAN_GetCERTCertificate(ct);
+        if (!cert) {
+            return NULL;
+        }
 	CERT_DestroyCertificate(cert);
     }
     if (cp) {
 	CERTCertificate *cert = STAN_GetCERTCertificate(cp);
+        if (!cert) {
+            return NULL;
+        }
 	CERT_DestroyCertificate(cert);
     }
     if (c) {
 	return STAN_GetCERTCertificate(c);
     } else {
 	return NULL;
     }
 }
@@ -399,16 +414,19 @@ CERT_FindCertByNickname(CERTCertDBHandle
                                                        NULL, &usage, NULL);
     cert = PK11_FindCertFromNickname(nickname, NULL);
     c = NULL;
     if (cert) {
 	c = get_best_temp_or_perm(ct, STAN_GetNSSCertificate(cert));
 	CERT_DestroyCertificate(cert);
 	if (ct) {
 	    CERTCertificate *cert2 = STAN_GetCERTCertificate(ct);
+            if (!cert2) {
+                return NULL;
+            }
 	    CERT_DestroyCertificate(cert2);
 	}
     } else {
 	c = ct;
     }
     if (c) {
 	return STAN_GetCERTCertificate(c);
     } else {
@@ -449,16 +467,19 @@ CERT_FindCertByNicknameOrEmailAddr(CERTC
 	                                                NULL, &usage, NULL);
     }
     cert = PK11_FindCertFromNickname(name, NULL);
     if (cert) {
 	c = get_best_temp_or_perm(ct, STAN_GetNSSCertificate(cert));
 	CERT_DestroyCertificate(cert);
 	if (ct) {
 	    CERTCertificate *cert2 = STAN_GetCERTCertificate(ct);
+            if (!cert2) {
+                return NULL;
+            }
 	    CERT_DestroyCertificate(cert2);
 	}
     } else {
 	c = ct;
     }
     if (c) {
 	return STAN_GetCERTCertificate(c);
     }
@@ -514,24 +535,28 @@ CERT_CreateSubjectCertList(CERTCertList 
 	certList = CERT_NewCertList();
 	myList = PR_TRUE;
 	if (!certList) goto loser;
     }
     /* Iterate over the matching temp certs.  Add them to the list */
     ci = tSubjectCerts;
     while (ci && *ci) {
 	cert = STAN_GetCERTCertificate(*ci);
-	add_to_subject_list(certList, cert, validOnly, sorttime);
+        if (cert) {
+	    add_to_subject_list(certList, cert, validOnly, sorttime);
+        }
 	ci++;
     }
     /* Iterate over the matching perm certs.  Add them to the list */
     ci = pSubjectCerts;
     while (ci && *ci) {
 	cert = STAN_GetCERTCertificate(*ci);
-	add_to_subject_list(certList, cert, validOnly, sorttime);
+        if (cert) {
+	    add_to_subject_list(certList, cert, validOnly, sorttime);
+        }
 	ci++;
     }
     nss_ZFreeIf(tSubjectCerts);
     nss_ZFreeIf(pSubjectCerts);
     return certList;
 loser:
     nss_ZFreeIf(tSubjectCerts);
     nss_ZFreeIf(pSubjectCerts);
@@ -717,17 +742,34 @@ CERT_SaveSMimeProfile(CERTCertificate *c
     SECItem oldprof, oldproftime;
     SECItem *oldProfile = NULL;
     SECItem *oldProfileTime = NULL;
     PK11SlotInfo *slot = NULL;
     NSSCertificate *c;
     NSSCryptoContext *cc;
     nssSMIMEProfile *stanProfile = NULL;
     PRBool freeOldProfile = PR_FALSE;
-    
+    PK11SlotInfo* internalslot = PK11_GetInternalKeySlot();
+
+    if (cert && cert->slot != internalslot) {
+          /* this cert comes from an external source, we need to add it
+          to the cert db before creating an S/MIME profile */
+          rv = PK11_ImportCert(internalslot, cert,
+              CK_INVALID_HANDLE, NULL, PR_FALSE);
+
+          PK11_FreeSlot(internalslot);
+
+          if (rv != SECSuccess )
+          {
+              return SECFailure;
+          }
+    } else {
+        PK11_FreeSlot(internalslot);
+    }
+
     emailAddr = cert->emailAddr;
     
     if ( emailAddr == NULL ) {
 	goto loser;
     }
 
     c = STAN_GetNSSCertificate(cert);
     if (!c) return SECFailure;
--- a/security/nss/lib/certhigh/certhigh.c
+++ b/security/nss/lib/certhigh/certhigh.c
@@ -1125,16 +1125,19 @@ loser:
     if (!chain) goto loser;
     chain->certs = (SECItem*)PORT_ArenaAlloc(arena, len * sizeof(SECItem));
     if (!chain->certs) goto loser;
     i = 0;
     stanCert = stanChain[i];
     while (stanCert) {
 	SECItem derCert;
 	CERTCertificate *cCert = STAN_GetCERTCertificate(stanCert);
+	if (!cCert) {
+	    goto loser;
+	}
 	derCert.len = (unsigned int)stanCert->encoding.size;
 	derCert.data = (unsigned char *)stanCert->encoding.data;
 	SECITEM_CopyItem(arena, &chain->certs[i], &derCert);
 	CERT_DestroyCertificate(cCert);
 	stanCert = stanChain[++i];
     }
     if ( !includeRoot && len > 1) {
 	chain->len = len - 1;
@@ -1145,17 +1148,19 @@ loser:
     chain->arena = arena;
     nss_ZFreeIf(stanChain);
     return chain;
 loser:
     i = 0;
     stanCert = stanChain[i];
     while (stanCert) {
 	CERTCertificate *cCert = STAN_GetCERTCertificate(stanCert);
-	CERT_DestroyCertificate(cCert);
+	if (cCert) {
+	    CERT_DestroyCertificate(cCert);
+	}
 	stanCert = stanChain[++i];
     }
     nss_ZFreeIf(stanChain);
     if (arena) {
 	PORT_FreeArena(arena, PR_FALSE);
     }
     return NULL;
 #endif
--- a/security/nss/lib/certhigh/ocsp.c
+++ b/security/nss/lib/certhigh/ocsp.c
@@ -1793,424 +1793,293 @@ loser:
 	PORT_Free(path);
     if (hostname != NULL)
 	PORT_Free(hostname);
 
     return returnSock;
 }
 
 /*
- * Read from "fd" into "buf" -- expect/attempt to read a "minimum" number
- * of bytes, but do not exceed "maximum".  (Obviously, stop at less than
- * "minimum" if hit end-of-stream.)  Only problems are low-level i/o errors.
+ * Read from "fd" into "buf" -- expect/attempt to read a given number of bytes
+ * Obviously, stop if hit end-of-stream. Timeout is passed in.
  */
+
 static int
-ocsp_MinMaxRead(PRFileDesc *fd, unsigned char *buf, int minimum, int maximum)
+ocsp_read(PRFileDesc *fd, char *buf, int toread, PRIntervalTime timeout)
 {
     int total = 0;
 
-    while (total < minimum) {
-	PRInt32 got;
-
-	got = PR_Read(fd, buf + total, (PRInt32) (maximum - total));
-	if (got < 0) {
-	    if (PR_GetError() != PR_WOULD_BLOCK_ERROR) {
-		break;
-	    }
-	    continue;
-	} else if (got == 0) {			/* EOS */
-	    break;
-	}
-
-	total += got;
+    while (total < toread)
+    {
+        PRInt32 got;
+
+        got = PR_Recv(fd, buf + total, (PRInt32) (toread - total), 0, timeout);
+        if (got < 0)
+        {
+            if (0 == total)
+            {
+                total = -1; /* report the error if we didn't read anything yet */
+            }
+            break;
+        }
+        else
+        if (got == 0)
+        {			/* EOS */
+            break;
+        }
+
+        total += got;
     }
 
     return total;
 }
 
-#ifdef BUFSIZ
-#define OCSP_BUFSIZE BUFSIZ
-#else
 #define OCSP_BUFSIZE 1024
-#endif
+
+#define AbortHttpDecode(error) \
+{ \
+        if (inBuffer) \
+            PORT_Free(inBuffer); \
+        PORT_SetError(error); \
+        return NULL; \
+}
+
 
 /*
- * Listens on the given socket and returns an encoded response when received.
- * Properly formatted HTTP response headers are expected to be read from the
- * socket, preceding a binary-encoded OCSP response.  Problems with parsing
- * cause the error SEC_ERROR_OCSP_BAD_HTTP_RESPONSE to be set; any other
- * problems are likely low-level i/o or memory allocation errors.
+ * Reads on the given socket and returns an encoded response when received.
+ * Properly formatted HTTP/1.0 response headers are expected to be read
+ * from the socket, preceding a binary-encoded OCSP response.  Problems
+ * with parsing cause the error SEC_ERROR_OCSP_BAD_HTTP_RESPONSE to be
+ * set; any other problems are likely low-level i/o or memory allocation
+ * errors.
  */
 static SECItem *
 ocsp_GetEncodedResponse(PRArenaPool *arena, PRFileDesc *sock)
 {
-    unsigned char *buf = NULL;
-    int bufsize, bytesRead, len;
-    const unsigned char *bufEnd;
-    const char *s;
-    const char *newline = NULL;
-    PRBool headersDone = PR_FALSE;
-    PRBool pendingCR = PR_FALSE;
-    PRBool contentTypeOK = PR_FALSE;
-    unsigned int contentLength = 0;
-    void *mark = NULL;
-    SECItem *result = NULL;
-
-
-    bufsize = OCSP_BUFSIZE;
-    buf = PORT_Alloc(bufsize+1);
-    buf[bufsize] = 0; /* NULL termination so string functions are OK */
-    if (buf == NULL) {
-	goto loser;
-    }
-    /*
-     * I picked 128 because:
-     *	- It is a nice "round" number. ;-)
-     *  - I am sure it should cover at least the first line of the http
-     *	  response (on the order of 20 should be enough but I am allowing
-     *	  for excessive leading whitespace) so that I don't have to keep
-     *	  checking for going past the end of the buffer until after that.
-     *	- I am sure that any interesting response will be bigger than that;
-     *    the exception is one that is status-only, like "tryLater".
-     *  - Given a trim response (no extra whitespace), it should cover
-     *	  all of the http headers, and just a bit of the content.
-     *	  This is what I was aiming for, to minimize data copying.
-     */
-    bytesRead = ocsp_MinMaxRead(sock, buf, 128, bufsize);
-    if (bytesRead <= 0) {
-	if (bytesRead == 0)
-	    PORT_SetError(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
-	goto loser;
-    }
-    bufEnd = buf + bytesRead;
-    /*
-     * Skip leading whitespace.
-     */
-    for (s = (char *)buf; s < (char *)bufEnd; s++) {
-	if (*s != ' ' && *s != '\t') {
-	    break;
-	}
+    /* first read HTTP status line and headers */
+
+    char* inBuffer = NULL;
+    PRInt32 offset = 0;
+    PRInt32 inBufsize = 0;
+    const PRInt32 bufSizeIncrement = OCSP_BUFSIZE; /* 1 KB at a time */
+    const PRInt32 maxBufSize = 8 * bufSizeIncrement ; /* 8 KB max */
+    const char* CRLF = "\r\n";
+    const PRInt32 CRLFlen = strlen(CRLF);
+    const char* headerEndMark = "\r\n\r\n";
+    const PRInt32 markLen = strlen(headerEndMark);
+    const PRIntervalTime ocsptimeout =
+        PR_SecondsToInterval(30); /* hardcoded to 30s for now */
+    char* headerEnd = NULL;
+    PRBool EOS = PR_FALSE;
+    const char* httpprotocol = "HTTP/";
+    const PRInt32 httplen = strlen(httpprotocol);
+    const char* httpcode = NULL;
+    const char* contenttype = NULL;
+    PRInt32 contentlength = 0;
+    PRInt32 bytesRead = 0;
+    char* statusLineEnd = NULL;
+    char* space = NULL;
+    char* nextHeader = NULL;
+    SECItem* result = NULL;
+
+    /* read up to at least the end of the HTTP headers */
+    do
+    {
+        inBufsize += bufSizeIncrement;
+        inBuffer = PORT_Realloc(inBuffer, inBufsize+1);
+        if (NULL == inBuffer)
+        {
+            AbortHttpDecode(SEC_ERROR_NO_MEMORY);
+        }
+        bytesRead = ocsp_read(sock, inBuffer + offset, bufSizeIncrement,
+            ocsptimeout);
+        if (bytesRead > 0)
+        {
+            PRInt32 searchOffset = (offset - markLen) >0 ? offset-markLen : 0;
+            offset += bytesRead;
+            *(inBuffer + offset) = '\0'; /* NULL termination */
+            headerEnd = strstr((const char*)inBuffer + searchOffset, headerEndMark);
+            if (bytesRead < bufSizeIncrement)
+            {
+                /* we read less data than requested, therefore we are at
+                   EOS or there was a read error */
+                EOS = PR_TRUE;
+            }
+        }
+        else
+        {
+            /* recv error or EOS */
+            EOS = PR_TRUE;
+        }
+    } while ( (!headerEnd) && (PR_FALSE == EOS) &&
+              (inBufsize < maxBufSize) );
+
+    if (!headerEnd)
+    {
+        AbortHttpDecode(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
     }
-    /*
-     * Here we expect to find something like "HTTP/1.x 200 OK\r\n".
-     * (The status code may be anything, but should be 3 digits.
-     * The comment (e.g. "OK") may be anything as well.)  I figure that
-     * the minimal line would be "HTTP/x.y zzz\n", which is 13 chars.
-     * That may not even meet the spec, but we will accept it -- anything
-     * less than that, though, we will not.
-     */
-    if (((char *)bufEnd - s) < 13 || PORT_Strncasecmp(s, "http/", 5) != 0) {
-	PORT_SetError(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
-	goto loser;
+
+    /* parse the HTTP status line  */
+    statusLineEnd = strstr((const char*)inBuffer, CRLF);
+    if (!statusLineEnd)
+    {
+        AbortHttpDecode(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
     }
-    s += 5;			/* skip "http/" */
-    /*
-     * I don't see a reason to look at the version number.  Assuming that
-     * whatever version it is, it supports the one or two headers we are
-     * looking for, and doesn't completely change the interpretation of
-     * status values, it shouldn't matter.  We shouldn't reject something
-     * that would otherwise work just because the code was picky about
-     * version number.  So we just skip it, hoping real incompatibility
-     * will manifest itself in the parsing.
-     */
-    while (*s++ != ' ') {	/* skip "x.y ", without interpretation */
-	/*
-	 * We expect the version number to be only a few characters,
-	 * and that we should easily have enough in the buffer to cover.
-	 * So, if we go past the end, just bail.
-	 */
-	if (s >= (char *)bufEnd) {
-	    PORT_SetError(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
-	    goto loser;
-	}
+    *statusLineEnd = '\0';
+
+    /* check for HTTP/ response */
+    space = strchr((const char*)inBuffer, ' ');
+    if (!space || PORT_Strncasecmp((const char*)inBuffer, httpprotocol, httplen) != 0 )
+    {
+        AbortHttpDecode(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
     }
-    /*
-     * Now get, and check, the status.  Accept 200-299; reject all else.
-     * There are some 200s that basically have no content, but that will
-     * fall out as bad below, and it's just easier to handle it that way
-     * than to try to know all the different status values.
-     */
+
+    /* check the HTTP status code of 200 */
+    httpcode = space +1;
+    space = strchr(httpcode, ' ');
+    if (!space)
     {
-	int statusCode = PORT_Atoi(s);
-
-	if (statusCode < 200 || statusCode >= 300) {
-	    PORT_SetError(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
-	    goto loser;
-	}
+        AbortHttpDecode(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
+    }
+    *space = 0;
+    if (0 != strcmp(httpcode, "200"))
+    {
+        AbortHttpDecode(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
     }
-    s += 3;			/* skip 3-digit status code */
-    /*
-     * The rest of the line is a comment, which we just want to skip.
-     * The next thing to do is continue through all of the HTTP headers,
-     * watching for the couple we are interested in.  The end of the
-     * headers (and thus the beginning of the content) is marked by
-     * two consecutive newlines.  (According to spec that should be
-     * CRLF followed by CRLF, but we are being generous and allowing
-     * for people who send only CRs or only LFs, too.)
-     *
-     * XXX Explain better about how the following code works.
-     * Especially what the potential values of "newline" are and what
-     * each one means.
-     */
-    while (1) {
-	/*
-	 * Move forward to the next line, stopping when we find a CRLF,
-	 * CR, or LF, or the end of the buffer.  We have to be careful
-	 * when we find a lone CR at the end of the buffer, because if
-	 * the next character read is an LF we want to treat it as one
-	 * newline altogether.
-	 *
-	 * We also need to detect two newlines in a row, which is what
-	 * marks the end of the headers and time for us to quit out of
-	 * the outer loop.
-	 */
-	for (; s < (char *)bufEnd; s++) {
-	    if (*s == '\r' || *s == '\n') {
-		if (s == newline) {
-		    headersDone = PR_TRUE;	/* 2nd consecutive newline */
-		}
-		newline = s;
-		if (newline[0] == '\r') {
-		    if (s == (char *)bufEnd - 1) {
-			/* CR at end - wait for the next character */
-			newline = NULL;
-			pendingCR = PR_TRUE;
-			break;
-		    } else if (newline[1] == '\n') {
-			/* CRLF seen; swallow both */
-			newline++;
-		    }
-		}
-		newline++;
-		break;
-	    }
-	    /*
-	     * After the first time through, we no longer need to remember
-	     * where the previous line started.  We needed it for checking
-	     * for consecutive newlines, but now we need it to be clear in
-	     * case we finish the loop by finishing off the buffer.
-	     */
-	    newline = NULL;
-	}
-	if (headersDone) {
-	    s = newline;
-	    break;
-	}
-	/*
-	 * When we are here, either:
-	 *	- newline is NULL, meaning we're at the end of the buffer
-	 *	  and we need to refill it, or
-	 *	- newline points to the first character on the new line
-	 */
-	if (newline == NULL) {
-	    /* So, we need to refill the buffer. */
-	    len = pendingCR ? 1 : 0;
-	    bytesRead = ocsp_MinMaxRead(sock, buf + len, 64 - len,
-					bufsize - len);
-	    if (bytesRead <= 0) {
-		if (bytesRead == 0)
-		    PORT_SetError(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
-		goto loser;
-	    }
-	    s = (char *)buf;
-	    bufEnd = buf + len + bytesRead;
-	    if (pendingCR) {
-		buf[0] = '\r';
-		pendingCR = PR_FALSE;
-	    }
-	    continue;
-	}
-	/*
-	 * Okay, now we know that we are looking at an HTTP header line
-	 * with enough length to be safe for our comparisons.  See if it is
-	 * one of the ones we are interested in.  (That is, "Content-Length"
-	 * or "Content-Type".)
-	 */
-	if (PORT_Strncasecmp(newline, "content-", 8) == 0) {
-	    s = newline + 8;
-	    if (PORT_Strncasecmp(s, "type: ", 6) == 0) {
-		s += 6;
-		if (PORT_Strncasecmp(s, "application/ocsp-response",
-				     25) != 0) {
-		    break;
-		}
-		contentTypeOK = PR_TRUE;
-		s += 25;
-	    } else if (PORT_Strncasecmp(s, "length: ", 8) == 0) {
-		s += 8;
-		contentLength = PORT_Atoi(s);
-	    }
-	    newline = NULL;
-	} else {
-	    /*
-	     * Not an interesting header.  We will go around the loop
-	     * again to find the next line.
-	     */
-	    s = newline;
-	}
+
+    /* parse the HTTP headers in the buffer . We only care about
+       content-type and content-length
+    */
+
+    nextHeader = statusLineEnd + CRLFlen;
+    *headerEnd = '\0'; /* terminate */
+    do
+    {
+        char* thisHeaderEnd = NULL;
+        char* value = NULL;
+        char* colon = strchr(nextHeader, ':');
+        
+        if (!colon)
+        {
+            AbortHttpDecode(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
+        }
+
+        *colon = '\0';
+        value = colon + 1;
+
+        /* jpierre - note : the following code will only handle the basic form
+           of HTTP/1.0 response headers, of the form "name: value" . Headers
+           split among multiple lines are not supported. This is not common
+           and should not be an issue, but it could become one in the
+           future */
+
+        if (*value != ' ')
+        {
+            AbortHttpDecode(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
+        }
+
+        value++;
+        thisHeaderEnd  = strstr(value, CRLF);
+        if (thisHeaderEnd )
+        {
+            *thisHeaderEnd  = '\0';
+        }
+
+        if (0 == PORT_Strcasecmp(nextHeader, "content-type"))
+        {
+            contenttype = value;
+        }
+        else
+        if (0 == PORT_Strcasecmp(nextHeader, "content-length"))
+        {
+            contentlength = atoi(value);
+        }
+
+        if (thisHeaderEnd )
+        {
+            nextHeader = thisHeaderEnd + CRLFlen;
+        }
+        else
+        {
+            nextHeader = NULL;
+        }
+
+    } while (nextHeader && (nextHeader < (headerEnd + CRLFlen) ) );
+
+    /* check content-type */
+    if (!contenttype ||
+        (0 != PORT_Strcasecmp(contenttype, "application/ocsp-response")) )
+    {
+        AbortHttpDecode(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
+    }
+
+    /* read the body of the OCSP response */
+    offset = offset - (PRInt32) (headerEnd - (const char*)inBuffer) - markLen;
+    if (offset)
+    {
+        /* move all data to the beginning of the buffer */
+        PORT_Memmove(inBuffer, headerEnd + markLen, offset);
+    }
+
+    /* resize buffer to only what's needed to hold the current response */
+    inBufsize = (1 + (offset-1) / bufSizeIncrement ) * bufSizeIncrement ;
+
+    while ( (PR_FALSE == EOS) &&
+            ( (contentlength == 0) || (offset < contentlength) ) &&
+            (inBufsize < maxBufSize)
+            )
+    {
+        /* we still need to receive more body data */
+        inBufsize += bufSizeIncrement;
+        inBuffer = PORT_Realloc(inBuffer, inBufsize+1);
+        if (NULL == inBuffer)
+        {
+            AbortHttpDecode(SEC_ERROR_NO_MEMORY);
+        }
+        bytesRead = ocsp_read(sock, inBuffer + offset, bufSizeIncrement,
+                              ocsptimeout);
+        if (bytesRead > 0)
+        {
+            offset += bytesRead;
+            if (bytesRead < bufSizeIncrement)
+            {
+                /* we read less data than requested, therefore we are at
+                   EOS or there was a read error */
+                EOS = PR_TRUE;
+            }
+        }
+        else
+        {
+            /* recv error or EOS */
+            EOS = PR_TRUE;
+        }
+    }
+
+    if (0 == offset)
+    {
+        AbortHttpDecode(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
     }
 
     /*
-     * Check that we got the correct content type.  (If !contentTypeOK,
-     * the content-type header was either bad or missing.)
-     */
-    if (!contentTypeOK) {
-	PORT_SetError(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
-	goto loser;
-    }
-
-    /*
-     * Now we need to handle the actual content.  We may not have a
-     * good content-length; things are harder if we do not -- in that
-     * case we will just read until we get EOS.
-     */
-
-    /*
-     * We are finally about the allocate the return area; before that
-     * mark the arena so we can release-back on error.
-     */
-    if (arena != NULL) {
-	mark = PORT_ArenaMark(arena);
-    }
-    /*
-     * How much of the content is already in the buffer?
-     */ 
-    if (s == NULL) {
-	len = 0;
-    } else {
-	len = (char *)bufEnd - s;
-	if (contentLength && len > contentLength) {
-	    len = contentLength;
-	}
-    }
-    /*
      * Now allocate the item to hold the data.
      */
-    result = SECITEM_AllocItem(arena, NULL,
-			       contentLength ? contentLength : len);
-    if (result == NULL) {
-	goto loser;
-    }
-    /*
-     * And copy the data left in the buffer.
-     */
-    if (len) {
-	PORT_Memcpy(result->data, s, len);
+    result = SECITEM_AllocItem(arena, NULL, offset);
+    if (NULL == result)
+    {
+        AbortHttpDecode(SEC_ERROR_NO_MEMORY);
     }
 
     /*
-     * Now we need to read all of the (rest of the) content.  If we know
-     * the length, it's easy, just one big read.  If not, we need to loop,
-     * reading until there is nothing left to read.
-     */
-    if (contentLength) {
-	int remaining;
-
-	/*
-	 * It may be the case that our last buffer ended exactly on the
-	 * second CR of the CRLF pair which denotes the end of the headers.
-	 * If so, we have to be prepared to read, and skip over, an LF.
-	 * Since we want to read the rest of the content directly into
-	 * the buffer we are returning, we read one byte specifically and
-	 * see if it is an LF.  If not, we just copy that byte into the
-	 * first byte of our return value.
-	 */
-	if (pendingCR) {
-	    PORT_Assert(len == 0);
-	    bytesRead = ocsp_MinMaxRead(sock, buf, 1, 1);
-	    if (bytesRead < 1) {
-		goto loser;
-	    }
-	    if (buf[0] != '\n') {
-		result->data[0] = buf[0];
-		len = 1;
-	    }
-	}
-	remaining = contentLength - len;
-	if (remaining) {
-	    bytesRead = ocsp_MinMaxRead(sock, result->data + len,
-					remaining, remaining);
-	    if (bytesRead < remaining) {
-		if (bytesRead > 0) {
-		    PORT_SetError(SEC_ERROR_OCSP_BAD_HTTP_RESPONSE);
-		}
-		goto loser;
-	    }
-	}
-    } else while (1) {
-	/*
-	 * Read as much as we can.  There is no real minimum here,
-	 * we will just take whatever we can get and copy it over
-	 * into our result area.
-	 */
-	bytesRead = ocsp_MinMaxRead(sock, buf, 1, bufsize);
-	if (bytesRead < 0) {
-	    goto loser;
-	}
-	if (bytesRead == 0) {		/* EOS: all done reading */
-	    break;
-	}
-	/*
-	 * Now make room for that many more bytes in our result area.
-	 */
-	if (SECITEM_ReallocItem(arena, result, len,
-				len + bytesRead) != SECSuccess) {
-	    goto loser;
-	}
-	/*
-	 * The first time through this loop, it may be the case that
-	 * we have the final LF of our CRLF pair that ended the headers.
-	 * If so, we need to skip over it.
-	 */
-	if (pendingCR && buf[0] == '\n') {
-	    PORT_Memcpy(result->data + len, buf + 1, bytesRead - 1);
-	    len += bytesRead - 1;
-	} else {
-	    PORT_Memcpy(result->data + len, buf, bytesRead);
-	    len += bytesRead;
-	}
-	/*
-	 * In any case, after the first time through, we are done
-	 * looking for that LF.
-	 */
-	pendingCR = PR_FALSE;
-	/*
-	 * If we are reading "slowly", get ourselves a bigger buffer.
-	 */
-	if (bytesRead == bufsize) {
-	    bufsize *= 2;
-	    PORT_Free(buf);
-	    buf = PORT_Alloc(bufsize);
-	    if (buf == NULL) {
-		goto loser;
-	    }
-	}
-    }
-
-    /*
-     * Finally, we are done!  The encoded response (the content of the
-     * HTTP response) is now in "result".  We just have a little cleaning
-     * up to do before we return.
-     */
-    if (mark != NULL) {
-	PORT_ArenaUnmark(arena, mark);
-    }
-    PORT_Free(buf);
+     * And copy the data left in the buffer.
+    */
+    PORT_Memcpy(result->data, inBuffer, offset);
+
+    /* and free the temporary buffer */
+    PORT_Free(inBuffer);
     return result;
-
-loser:
-    if (mark != NULL) {
-	PORT_ArenaRelease(arena, mark);
-    } else if (result != NULL) {
-	SECITEM_FreeItem(result, PR_TRUE);
-    }
-    if (buf != NULL) {
-	PORT_Free(buf);
-    }
-    return NULL;
 }
 
 
 /*
  * FUNCTION: CERT_GetEncodedOCSPResponse
  *   Creates and sends a request to an OCSP responder, then reads and
  *   returns the (encoded) response.
  * INPUTS:
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -34,26 +34,25 @@
 #ifdef DEBUG
 static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
 #endif /* DEBUG */
 
 #ifndef BUILTINS_H
 #include "builtins.h"
 #endif /* BUILTINS_H */
 
-static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
-static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509;
-static const CK_BBOOL ck_false = CK_FALSE;
+static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
 static const CK_TRUST ckt_netscape_valid = CKT_NETSCAPE_VALID;
+static const CK_OBJECT_CLASS cko_netscape_builtin_root_list = CKO_NETSCAPE_BUILTIN_ROOT_LIST;
 static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
+static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509;
 static const CK_OBJECT_CLASS cko_data = CKO_DATA;
+static const CK_BBOOL ck_false = CK_FALSE;
 static const CK_BBOOL ck_true = CK_TRUE;
-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_valid_delegator = CKT_NETSCAPE_VALID_DELEGATOR;
+static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
 #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
 };
@@ -386,231 +385,93 @@ static const CK_ATTRIBUTE_TYPE nss_built
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_111 [] = {
  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
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_112 [] = {
  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_113 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_114 [] = {
  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_115 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_116 [] = {
  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_117 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_118 [] = {
  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_119 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_120 [] = {
  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_121 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_122 [] = {
  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_123 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_124 [] = {
  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_125 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_126 [] = {
  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_127 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_128 [] = {
  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_129 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_130 [] = {
  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_131 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_132 [] = {
  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_133 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_134 [] = {
  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_135 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_136 [] = {
- 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_137 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_138 [] = {
- 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_139 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_140 [] = {
- 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_141 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_142 [] = {
- 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_143 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_144 [] = {
- 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_145 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_146 [] = {
- 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_147 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_148 [] = {
- 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_149 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_150 [] = {
- 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_151 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_152 [] = {
- 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_153 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_154 [] = {
- 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_155 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_156 [] = {
- 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_157 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_158 [] = {
- 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_159 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_160 [] = {
- 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_161 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_162 [] = {
- 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_163 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_164 [] = {
- 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_165 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_166 [] = {
- 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_167 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_168 [] = {
- 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_169 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_170 [] = {
- 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_171 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_172 [] = {
- 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_173 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_174 [] = {
- 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_175 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_176 [] = {
- 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_177 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_178 [] = {
- 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_179 [] = {
- 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
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_180 [] = {
- 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_181 [] = {
- 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_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING
 };
 #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$ $Revision$ $Date$ $Name$""; @(#) $RCSfile$ $Revision$ $Date$ $Name$", (PRUint32)179 }
+  { (void *)"@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $RCSfile$ $Revision$ $Date$ $Name$", (PRUint32)184 }
 };
 #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 }
@@ -877,301 +738,16 @@ static const NSSItem nss_builtins_items_
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
 };
 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 *)"GTE CyberTrust Root 5", (PRUint32)22 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\160\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157"
-"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125"
-"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165"
-"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156"
-"\143\056\061\036\060\034\006\003\125\004\003\023\025\107\124\105"
-"\040\103\171\142\145\162\124\162\165\163\164\040\122\157\157\164"
-"\040\065"
-, (PRUint32)114 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\160\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157"
-"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125"
-"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165"
-"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156"
-"\143\056\061\036\060\034\006\003\125\004\003\023\025\107\124\105"
-"\040\103\171\142\145\162\124\162\165\163\164\040\122\157\157\164"
-"\040\065"
-, (PRUint32)114 },
-  { (void *)"\001\266"
-, (PRUint32)2 },
-  { (void *)"\060\202\003\266\060\202\002\236\240\003\002\001\002\002\002\001"
-"\266\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000"
-"\060\160\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157"
-"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125"
-"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165"
-"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156"
-"\143\056\061\036\060\034\006\003\125\004\003\023\025\107\124\105"
-"\040\103\171\142\145\162\124\162\165\163\164\040\122\157\157\164"
-"\040\065\060\036\027\015\071\070\060\070\061\064\061\064\065\060"
-"\060\060\132\027\015\061\063\060\070\061\064\062\063\065\071\060"
-"\060\132\060\160\061\013\060\011\006\003\125\004\006\023\002\125"
-"\123\061\030\060\026\006\003\125\004\012\023\017\107\124\105\040"
-"\103\157\162\160\157\162\141\164\151\157\156\061\047\060\045\006"
-"\003\125\004\013\023\036\107\124\105\040\103\171\142\145\162\124"
-"\162\165\163\164\040\123\157\154\165\164\151\157\156\163\054\040"
-"\111\156\143\056\061\036\060\034\006\003\125\004\003\023\025\107"
-"\124\105\040\103\171\142\145\162\124\162\165\163\164\040\122\157"
-"\157\164\040\065\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\274\022\156\077\212\174\172\227\001\354\036"
-"\273\071\132\002\364\170\104\242\110\033\216\173\111\122\172\270"
-"\173\107\263\257\224\233\157\273\226\372\053\152\145\134\270\034"
-"\224\163\276\277\211\012\042\200\356\127\374\214\005\273\160\237"
-"\227\071\004\332\243\207\134\250\345\312\257\300\063\232\325\067"
-"\134\113\254\344\200\320\246\043\140\373\375\162\056\224\235\307"
-"\316\302\004\062\357\170\140\135\355\255\207\017\105\145\036\074"
-"\232\012\232\276\135\035\231\354\347\362\321\306\172\027\331\255"
-"\233\124\226\177\304\174\140\277\205\252\025\065\035\100\332\021"
-"\274\354\124\041\050\055\043\241\250\360\317\055\315\335\374\176"
-"\017\136\341\145\007\126\313\007\264\322\126\350\136\061\314\030"
-"\143\304\206\322\055\205\317\223\222\253\155\376\150\071\373\336"
-"\163\275\206\370\344\106\172\352\237\014\313\364\031\376\143\274"
-"\321\054\173\210\063\066\366\344\341\234\014\123\201\140\034\332"
-"\056\253\226\251\026\210\023\120\231\262\275\125\337\025\060\176"
-"\350\345\230\373\160\176\154\265\007\374\374\106\267\320\355\067"
-"\226\176\062\376\041\002\003\001\000\001\243\132\060\130\060\022"
-"\006\003\125\035\023\001\001\377\004\010\060\006\001\001\377\002"
-"\001\005\060\016\006\003\125\035\017\001\001\377\004\004\003\002"
-"\001\006\060\027\006\003\125\035\040\004\020\060\016\060\014\006"
-"\012\052\206\110\206\370\143\001\002\001\003\060\031\006\003\125"
-"\035\016\004\022\004\020\166\012\111\041\070\114\237\336\370\304"
-"\111\307\161\161\221\235\060\015\006\011\052\206\110\206\367\015"
-"\001\001\005\005\000\003\202\001\001\000\101\072\324\030\133\332"
-"\270\336\041\034\341\216\011\345\361\150\064\377\336\226\364\007"
-"\365\247\074\363\254\112\261\233\372\222\372\233\355\346\062\041"
-"\252\112\166\305\334\117\070\345\337\325\206\344\325\310\166\175"
-"\230\327\261\315\217\115\265\221\043\154\213\212\353\352\174\357"
-"\024\224\304\306\360\037\112\055\062\161\143\053\143\221\046\002"
-"\011\266\200\035\355\342\314\270\177\333\207\143\310\341\320\154"
-"\046\261\065\035\100\146\020\033\315\225\124\030\063\141\354\023"
-"\117\332\023\367\231\257\076\320\317\216\246\162\242\263\303\005"
-"\232\311\047\175\222\314\176\122\215\263\253\160\155\236\211\237"
-"\115\353\032\165\302\230\252\325\002\026\327\014\212\277\045\344"
-"\353\055\274\230\351\130\070\031\174\271\067\376\333\342\231\010"
-"\163\006\307\227\203\152\175\020\001\057\062\271\027\005\112\145"
-"\346\057\316\276\136\123\246\202\351\232\123\012\204\164\055\203"
-"\312\310\224\026\166\137\224\141\050\360\205\247\071\273\327\213"
-"\331\250\262\023\035\124\011\064\044\175\040\201\175\146\176\242"
-"\220\164\134\020\306\275\354\253\033\302"
-, (PRUint32)954 }
-};
-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 *)"GTE CyberTrust Root 5", (PRUint32)22 },
-  { (void *)"\107\305\114\274\332\135\166\316\142\210\070\021\254\021\146\135"
-"\125\364\054\000"
-, (PRUint32)20 },
-  { (void *)"\175\154\206\344\374\115\321\013\000\272\042\273\116\174\152\216"
-, (PRUint32)16 },
-  { (void *)"\060\160\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157"
-"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125"
-"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165"
-"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156"
-"\143\056\061\036\060\034\006\003\125\004\003\023\025\107\124\105"
-"\040\103\171\142\145\162\124\162\165\163\164\040\122\157\157\164"
-"\040\065"
-, (PRUint32)114 },
-  { (void *)"\001\266"
-, (PRUint32)2 },
-  { (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) }
-};
-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 *)"GTE CyberTrust Japan Root CA", (PRUint32)29 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061"
-"\037\060\035\006\003\125\004\012\023\026\103\171\142\145\162\124"
-"\162\165\163\164\040\112\141\160\141\156\054\040\111\156\143\056"
-"\061\041\060\037\006\003\125\004\003\023\030\103\171\142\145\162"
-"\124\162\165\163\164\040\112\101\120\101\116\040\122\157\157\164"
-"\040\103\101"
-, (PRUint32)83 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061"
-"\037\060\035\006\003\125\004\012\023\026\103\171\142\145\162\124"
-"\162\165\163\164\040\112\141\160\141\156\054\040\111\156\143\056"
-"\061\041\060\037\006\003\125\004\003\023\030\103\171\142\145\162"
-"\124\162\165\163\164\040\112\101\120\101\116\040\122\157\157\164"
-"\040\103\101"
-, (PRUint32)83 },
-  { (void *)"\116"
-, (PRUint32)1 },
-  { (void *)"\060\202\002\021\060\202\001\172\002\001\116\060\015\006\011\052"
-"\206\110\206\367\015\001\001\004\005\000\060\121\061\013\060\011"
-"\006\003\125\004\006\023\002\112\120\061\037\060\035\006\003\125"
-"\004\012\023\026\103\171\142\145\162\124\162\165\163\164\040\112"
-"\141\160\141\156\054\040\111\156\143\056\061\041\060\037\006\003"
-"\125\004\003\023\030\103\171\142\145\162\124\162\165\163\164\040"
-"\112\101\120\101\116\040\122\157\157\164\040\103\101\060\036\027"
-"\015\071\070\060\070\060\064\060\067\065\067\060\060\132\027\015"
-"\060\063\060\070\060\064\062\063\065\071\060\060\132\060\121\061"
-"\013\060\011\006\003\125\004\006\023\002\112\120\061\037\060\035"
-"\006\003\125\004\012\023\026\103\171\142\145\162\124\162\165\163"
-"\164\040\112\141\160\141\156\054\040\111\156\143\056\061\041\060"
-"\037\006\003\125\004\003\023\030\103\171\142\145\162\124\162\165"
-"\163\164\040\112\101\120\101\116\040\122\157\157\164\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\267\255\374"
-"\312\107\020\166\211\375\147\254\344\163\006\174\201\113\035\326"
-"\265\174\016\107\257\354\246\124\165\250\304\375\145\257\347\310"
-"\261\261\154\064\065\215\367\271\144\127\050\013\041\132\336\164"
-"\376\334\170\056\206\106\022\114\177\021\037\334\223\275\137\276"
-"\146\230\206\270\267\354\155\111\323\220\331\341\171\000\126\150"
-"\272\255\154\037\054\073\037\311\054\214\103\260\004\102\352\201"
-"\163\246\316\063\165\105\015\212\105\162\057\252\127\125\344\007"
-"\303\103\342\165\072\017\274\074\320\204\316\272\357\002\003\001"
-"\000\001\060\015\006\011\052\206\110\206\367\015\001\001\004\005"
-"\000\003\201\201\000\267\246\144\243\014\200\074\034\304\330\356"
-"\101\073\345\206\244\236\140\135\326\001\062\250\152\144\055\040"
-"\160\100\272\162\116\146\372\007\145\116\003\216\013\375\126\340"
-"\255\073\040\247\062\372\262\022\036\200\337\036\343\172\030\314"
-"\127\333\346\311\064\140\357\165\353\020\026\320\244\056\160\330"
-"\044\043\270\245\167\163\102\371\007\072\335\001\154\010\223\007"
-"\065\046\020\045\140\051\377\011\345\144\237\151\271\026\111\363"
-"\134\335\044\143\106\223\015\260\123\066\165\274\110\040\273\031"
-"\266\217\320\042\375"
-, (PRUint32)533 }
-};
-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 *)"GTE CyberTrust Japan Root CA", (PRUint32)29 },
-  { (void *)"\327\237\165\115\072\165\304\327\022\276\200\056\155\367\251\056"
-"\135\022\021\045"
-, (PRUint32)20 },
-  { (void *)"\336\253\377\103\052\145\067\006\233\050\265\172\350\204\323\216"
-, (PRUint32)16 },
-  { (void *)"\060\121\061\013\060\011\006\003\125\004\006\023\002\112\120\061"
-"\037\060\035\006\003\125\004\012\023\026\103\171\142\145\162\124"
-"\162\165\163\164\040\112\141\160\141\156\054\040\111\156\143\056"
-"\061\041\060\037\006\003\125\004\003\023\030\103\171\142\145\162"
-"\124\162\165\163\164\040\112\101\120\101\116\040\122\157\157\164"
-"\040\103\101"
-, (PRUint32)83 },
-  { (void *)"\116"
-, (PRUint32)1 },
-  { (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) }
-};
-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 *)"GTE CyberTrust Japan Secure Server CA", (PRUint32)38 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\112\120\061"
-"\037\060\035\006\003\125\004\012\023\026\103\171\142\145\162\124"
-"\162\165\163\164\040\112\141\160\141\156\054\040\111\156\143\056"
-"\061\052\060\050\006\003\125\004\003\023\041\103\171\142\145\162"
-"\124\162\165\163\164\040\112\101\120\101\116\040\123\145\143\165"
-"\162\145\040\123\145\162\166\145\162\040\103\101"
-, (PRUint32)92 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\112\120\061"
-"\037\060\035\006\003\125\004\012\023\026\103\171\142\145\162\124"
-"\162\165\163\164\040\112\141\160\141\156\054\040\111\156\143\056"
-"\061\052\060\050\006\003\125\004\003\023\041\103\171\142\145\162"
-"\124\162\165\163\164\040\112\101\120\101\116\040\123\145\143\165"
-"\162\145\040\123\145\162\166\145\162\040\103\101"
-, (PRUint32)92 },
-  { (void *)"\117"
-, (PRUint32)1 },
-  { (void *)"\060\202\002\043\060\202\001\214\002\001\117\060\015\006\011\052"
-"\206\110\206\367\015\001\001\004\005\000\060\132\061\013\060\011"
-"\006\003\125\004\006\023\002\112\120\061\037\060\035\006\003\125"
-"\004\012\023\026\103\171\142\145\162\124\162\165\163\164\040\112"
-"\141\160\141\156\054\040\111\156\143\056\061\052\060\050\006\003"
-"\125\004\003\023\041\103\171\142\145\162\124\162\165\163\164\040"
-"\112\101\120\101\116\040\123\145\143\165\162\145\040\123\145\162"
-"\166\145\162\040\103\101\060\036\027\015\071\070\060\070\060\064"
-"\060\070\060\066\063\062\132\027\015\060\063\060\070\060\064\062"
-"\063\065\071\060\060\132\060\132\061\013\060\011\006\003\125\004"
-"\006\023\002\112\120\061\037\060\035\006\003\125\004\012\023\026"
-"\103\171\142\145\162\124\162\165\163\164\040\112\141\160\141\156"
-"\054\040\111\156\143\056\061\052\060\050\006\003\125\004\003\023"
-"\041\103\171\142\145\162\124\162\165\163\164\040\112\101\120\101"
-"\116\040\123\145\143\165\162\145\040\123\145\162\166\145\162\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\254"
-"\046\243\241\270\157\152\300\054\022\371\333\061\005\222\347\375"
-"\372\324\201\264\270\325\052\325\220\372\360\103\145\374\022\025"
-"\312\354\333\271\141\336\063\143\067\117\257\000\074\177\222\067"
-"\033\030\163\345\237\074\210\361\032\023\104\376\171\362\303\046"
-"\225\017\013\360\236\024\007\041\154\127\302\135\303\342\121\260"
-"\315\213\137\315\137\206\070\370\171\227\071\354\350\277\122\056"
-"\261\136\252\251\256\214\355\356\327\310\267\056\061\213\264\071"
-"\222\073\174\201\047\007\032\001\104\057\111\163\040\266\311\002"
-"\003\001\000\001\060\015\006\011\052\206\110\206\367\015\001\001"
-"\004\005\000\003\201\201\000\150\035\173\022\356\132\171\051\061"
-"\312\001\254\213\120\251\047\231\054\000\374\070\032\034\377\302"
-"\325\360\023\376\033\247\071\365\200\024\353\121\372\300\215\173"
-"\204\033\131\256\261\065\121\156\241\076\327\033\354\240\236\337"
-"\340\245\202\226\343\261\077\330\250\361\313\171\200\216\367\360"
-"\104\231\176\024\365\043\243\021\343\150\113\005\066\156\210\343"
-"\253\206\252\070\123\003\102\073\323\271\371\340\277\005\351\323"
-"\137\303\112\247\266\375\267\135\220\111\370\232\262\255\146\246"
-"\202\000\223\256\140\377\040"
-, (PRUint32)551 }
-};
-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 *)"GTE CyberTrust Japan Secure Server CA", (PRUint32)38 },
-  { (void *)"\326\371\221\145\061\321\304\017\030\247\073\051\236\031\267\157"
-"\246\302\111\063"
-, (PRUint32)20 },
-  { (void *)"\335\015\015\264\170\113\175\316\060\012\246\065\306\253\114\210"
-, (PRUint32)16 },
-  { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\112\120\061"
-"\037\060\035\006\003\125\004\012\023\026\103\171\142\145\162\124"
-"\162\165\163\164\040\112\141\160\141\156\054\040\111\156\143\056"
-"\061\052\060\050\006\003\125\004\003\023\041\103\171\142\145\162"
-"\124\162\165\163\164\040\112\101\120\101\116\040\123\145\143\165"
-"\162\145\040\123\145\162\166\145\162\040\103\101"
-, (PRUint32)92 },
-  { (void *)"\117"
-, (PRUint32)1 },
-  { (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) }
-};
-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 *)"Thawte Personal Basic CA", (PRUint32)25 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\313\061\013\060\011\006\003\125\004\006\023\002\132\101"
 "\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
 "\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
 "\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
 "\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
 "\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
@@ -1248,17 +824,17 @@ static const NSSItem nss_builtins_items_
 "\163\306\275\327\212\141\134\003\343\055\047\250\027\340\204\205"
 "\102\334\136\233\306\267\262\155\273\164\257\344\077\313\247\267"
 "\260\340\135\276\170\203\045\224\322\333\201\017\171\007\155\117"
 "\364\071\025\132\122\001\173\336\062\326\115\070\366\022\134\006"
 "\120\337\005\133\275\024\113\241\337\051\272\073\101\215\367\143"
 "\126\241\337\042\261"
 , (PRUint32)805 }
 };
-static const NSSItem nss_builtins_items_15 [] = {
+static const NSSItem nss_builtins_items_9 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Thawte Personal Basic CA", (PRUint32)25 },
   { (void *)"\100\347\214\035\122\075\034\331\225\117\254\032\032\263\275\074"
 "\272\241\133\374"
 , (PRUint32)20 },
@@ -1279,17 +855,17 @@ static const NSSItem nss_builtins_items_
 "\163\151\143\100\164\150\141\167\164\145\056\143\157\155"
 , (PRUint32)206 },
   { (void *)"\000"
 , (PRUint32)1 },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_16 [] = {
+static const NSSItem nss_builtins_items_10 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Thawte Personal Premium CA", (PRUint32)27 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\317\061\013\060\011\006\003\125\004\006\023\002\132\101"
 "\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
@@ -1372,17 +948,17 @@ static const NSSItem nss_builtins_items_
 "\157\205\147\216\336\053\271\342\027\260\072\240\360\016\242\000"
 "\232\337\363\024\025\156\273\310\205\132\230\200\371\377\276\164"
 "\035\075\363\376\060\045\321\067\064\147\372\245\161\171\060\141"
 "\051\162\300\340\054\114\373\126\344\072\250\157\345\062\131\122"
 "\333\165\050\120\131\014\370\013\031\344\254\331\257\226\215\057"
 "\120\333\007\303\352\037\253\063\340\365\053\061\211"
 , (PRUint32)813 }
 };
-static const NSSItem nss_builtins_items_17 [] = {
+static const NSSItem nss_builtins_items_11 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Thawte Personal Premium CA", (PRUint32)27 },
   { (void *)"\066\206\065\143\375\121\050\307\276\246\360\005\317\351\264\066"
 "\150\010\154\316"
 , (PRUint32)20 },
@@ -1404,17 +980,17 @@ static const NSSItem nss_builtins_items_
 "\157\155"
 , (PRUint32)210 },
   { (void *)"\000"
 , (PRUint32)1 },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_18 [] = {
+static const NSSItem nss_builtins_items_12 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (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"
@@ -1498,17 +1074,17 @@ static const NSSItem nss_builtins_items_
 "\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_19 [] = {
+static const NSSItem nss_builtins_items_13 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (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 },
@@ -1530,17 +1106,17 @@ static const NSSItem nss_builtins_items_
 "\056\143\157\155"
 , (PRUint32)212 },
   { (void *)"\000"
 , (PRUint32)1 },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_20 [] = {
+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 *)"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"
@@ -1620,17 +1196,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_21 [] = {
+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 *)"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 },
@@ -1651,17 +1227,17 @@ static const NSSItem nss_builtins_items_
 "\167\164\145\056\143\157\155"
 , (PRUint32)199 },
   { (void *)"\001"
 , (PRUint32)1 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_22 [] = {
+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 *)"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"
@@ -1744,17 +1320,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_23 [] = {
+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 *)"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 },
@@ -1776,349 +1352,17 @@ static const NSSItem nss_builtins_items_
 "\155"
 , (PRUint32)209 },
   { (void *)"\001"
 , (PRUint32)1 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
 };
-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 *)"American Express CA", (PRUint32)20 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\047\060\045\006\003\125\004\012\023\036\101\155\145\162\151"
-"\143\141\156\040\105\170\160\162\145\163\163\040\103\157\155\160"
-"\141\156\171\054\040\111\156\143\056\061\046\060\044\006\003\125"
-"\004\013\023\035\101\155\145\162\151\143\141\156\040\105\170\160"
-"\162\145\163\163\040\124\145\143\150\156\157\154\157\147\151\145"
-"\163\061\057\060\055\006\003\125\004\003\023\046\101\155\145\162"
-"\151\143\141\156\040\105\170\160\162\145\163\163\040\103\145\162"
-"\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151"
-"\164\171"
-, (PRUint32)146 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\047\060\045\006\003\125\004\012\023\036\101\155\145\162\151"
-"\143\141\156\040\105\170\160\162\145\163\163\040\103\157\155\160"
-"\141\156\171\054\040\111\156\143\056\061\046\060\044\006\003\125"
-"\004\013\023\035\101\155\145\162\151\143\141\156\040\105\170\160"
-"\162\145\163\163\040\124\145\143\150\156\157\154\157\147\151\145"
-"\163\061\057\060\055\006\003\125\004\003\023\046\101\155\145\162"
-"\151\143\141\156\040\105\170\160\162\145\163\163\040\103\145\162"
-"\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151"
-"\164\171"
-, (PRUint32)146 },
-  { (void *)"\000\215"
-, (PRUint32)2 },
-  { (void *)"\060\202\002\220\060\202\001\371\002\002\000\215\060\015\006\011"
-"\052\206\110\206\367\015\001\001\004\005\000\060\201\217\061\013"
-"\060\011\006\003\125\004\006\023\002\125\123\061\047\060\045\006"
-"\003\125\004\012\023\036\101\155\145\162\151\143\141\156\040\105"
-"\170\160\162\145\163\163\040\103\157\155\160\141\156\171\054\040"
-"\111\156\143\056\061\046\060\044\006\003\125\004\013\023\035\101"
-"\155\145\162\151\143\141\156\040\105\170\160\162\145\163\163\040"
-"\124\145\143\150\156\157\154\157\147\151\145\163\061\057\060\055"
-"\006\003\125\004\003\023\046\101\155\145\162\151\143\141\156\040"
-"\105\170\160\162\145\163\163\040\103\145\162\164\151\146\151\143"
-"\141\164\145\040\101\165\164\150\157\162\151\164\171\060\036\027"
-"\015\071\070\060\070\061\064\062\062\060\061\060\060\132\027\015"
-"\060\066\060\070\061\064\062\063\065\071\060\060\132\060\201\217"
-"\061\013\060\011\006\003\125\004\006\023\002\125\123\061\047\060"
-"\045\006\003\125\004\012\023\036\101\155\145\162\151\143\141\156"
-"\040\105\170\160\162\145\163\163\040\103\157\155\160\141\156\171"
-"\054\040\111\156\143\056\061\046\060\044\006\003\125\004\013\023"
-"\035\101\155\145\162\151\143\141\156\040\105\170\160\162\145\163"
-"\163\040\124\145\143\150\156\157\154\157\147\151\145\163\061\057"
-"\060\055\006\003\125\004\003\023\046\101\155\145\162\151\143\141"
-"\156\040\105\170\160\162\145\163\163\040\103\145\162\164\151\146"
-"\151\143\141\164\145\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\311\362\111\222"
-"\205\312\375\025\051\265\006\266\104\354\374\210\243\362\206\316"
-"\377\024\117\044\034\222\371\302\043\301\316\103\337\135\064\310"
-"\270\024\354\325\052\160\221\111\225\327\126\315\224\361\251\223"
-"\320\150\042\334\115\175\240\012\162\052\107\352\045\360\205\000"
-"\137\066\124\141\317\013\371\067\132\147\235\351\037\351\144\077"
-"\160\225\141\247\320\060\002\336\046\050\244\146\003\004\351\060"
-"\373\217\063\007\371\157\141\207\242\162\333\363\150\170\143\146"
-"\131\251\311\267\146\341\025\262\110\066\054\371\002\003\001\000"
-"\001\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000"
-"\003\201\201\000\150\027\142\270\163\213\114\154\353\112\245\076"
-"\253\345\235\056\322\315\212\007\127\363\306\131\227\166\027\027"
-"\370\122\216\047\223\330\130\330\050\154\364\242\004\172\212\302"
-"\166\044\261\002\264\337\050\362\367\363\250\247\176\043\110\141"
-"\210\364\021\150\256\046\135\366\241\113\123\045\152\330\052\024"
-"\002\016\340\207\040\156\236\031\134\163\220\013\043\342\061\227"
-"\043\077\325\042\242\323\006\173\332\067\365\327\265\101\104\027"
-"\172\105\002\331\205\105\146\326\216\307\360\172\014\231\142\042"
-"\151\133\355\322"
-, (PRUint32)660 }
-};
-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 *)"American Express CA", (PRUint32)20 },
-  { (void *)"\254\231\217\200\304\240\005\370\156\362\240\256\110\030\344\117"
-"\110\237\370\177"
-, (PRUint32)20 },
-  { (void *)"\034\325\216\202\276\160\125\216\071\141\337\255\121\333\153\240"
-, (PRUint32)16 },
-  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\047\060\045\006\003\125\004\012\023\036\101\155\145\162\151"
-"\143\141\156\040\105\170\160\162\145\163\163\040\103\157\155\160"
-"\141\156\171\054\040\111\156\143\056\061\046\060\044\006\003\125"
-"\004\013\023\035\101\155\145\162\151\143\141\156\040\105\170\160"
-"\162\145\163\163\040\124\145\143\150\156\157\154\157\147\151\145"
-"\163\061\057\060\055\006\003\125\004\003\023\046\101\155\145\162"
-"\151\143\141\156\040\105\170\160\162\145\163\163\040\103\145\162"
-"\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151"
-"\164\171"
-, (PRUint32)146 },
-  { (void *)"\000\215"
-, (PRUint32)2 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
-};
-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 *)"American Express Global CA", (PRUint32)27 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\226\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\047\060\045\006\003\125\004\012\023\036\101\155\145\162\151"
-"\143\141\156\040\105\170\160\162\145\163\163\040\103\157\155\160"
-"\141\156\171\054\040\111\156\143\056\061\046\060\044\006\003\125"
-"\004\013\023\035\101\155\145\162\151\143\141\156\040\105\170\160"
-"\162\145\163\163\040\124\145\143\150\156\157\154\157\147\151\145"
-"\163\061\066\060\064\006\003\125\004\003\023\055\101\155\145\162"
-"\151\143\141\156\040\105\170\160\162\145\163\163\040\107\154\157"
-"\142\141\154\040\103\145\162\164\151\146\151\143\141\164\145\040"
-"\101\165\164\150\157\162\151\164\171"
-, (PRUint32)153 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\226\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\047\060\045\006\003\125\004\012\023\036\101\155\145\162\151"
-"\143\141\156\040\105\170\160\162\145\163\163\040\103\157\155\160"
-"\141\156\171\054\040\111\156\143\056\061\046\060\044\006\003\125"
-"\004\013\023\035\101\155\145\162\151\143\141\156\040\105\170\160"
-"\162\145\163\163\040\124\145\143\150\156\157\154\157\147\151\145"
-"\163\061\066\060\064\006\003\125\004\003\023\055\101\155\145\162"
-"\151\143\141\156\040\105\170\160\162\145\163\163\040\107\154\157"
-"\142\141\154\040\103\145\162\164\151\146\151\143\141\164\145\040"
-"\101\165\164\150\157\162\151\164\171"
-, (PRUint32)153 },
-  { (void *)"\000\205"
-, (PRUint32)2 },
-  { (void *)"\060\202\004\004\060\202\002\354\240\003\002\001\002\002\002\000"
-"\205\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000"
-"\060\201\226\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\047\060\045\006\003\125\004\012\023\036\101\155\145\162\151"
-"\143\141\156\040\105\170\160\162\145\163\163\040\103\157\155\160"
-"\141\156\171\054\040\111\156\143\056\061\046\060\044\006\003\125"
-"\004\013\023\035\101\155\145\162\151\143\141\156\040\105\170\160"
-"\162\145\163\163\040\124\145\143\150\156\157\154\157\147\151\145"
-"\163\061\066\060\064\006\003\125\004\003\023\055\101\155\145\162"
-"\151\143\141\156\040\105\170\160\162\145\163\163\040\107\154\157"
-"\142\141\154\040\103\145\162\164\151\146\151\143\141\164\145\040"
-"\101\165\164\150\157\162\151\164\171\060\036\027\015\071\070\060"
-"\070\061\064\061\071\060\066\060\060\132\027\015\061\063\060\070"
-"\061\064\062\063\065\071\060\060\132\060\201\226\061\013\060\011"
-"\006\003\125\004\006\023\002\125\123\061\047\060\045\006\003\125"
-"\004\012\023\036\101\155\145\162\151\143\141\156\040\105\170\160"
-"\162\145\163\163\040\103\157\155\160\141\156\171\054\040\111\156"
-"\143\056\061\046\060\044\006\003\125\004\013\023\035\101\155\145"
-"\162\151\143\141\156\040\105\170\160\162\145\163\163\040\124\145"
-"\143\150\156\157\154\157\147\151\145\163\061\066\060\064\006\003"
-"\125\004\003\023\055\101\155\145\162\151\143\141\156\040\105\170"
-"\160\162\145\163\163\040\107\154\157\142\141\154\040\103\145\162"
-"\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151"
-"\164\171\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\360\044\046\146\056\373\353\112\163\161\123\211\107"
-"\313\046\074\123\222\224\114\312\302\205\265\015\370\303\127\275"
-"\057\052\037\152\030\267\127\257\014\000\026\372\240\266\220\246"
-"\367\032\241\056\146\046\307\150\243\212\223\151\146\265\106\126"
-"\055\035\202\352\220\014\012\042\302\211\120\215\005\363\324\253"
-"\163\101\360\317\022\254\050\264\157\024\224\226\131\113\236\220"
-"\165\206\337\342\107\353\341\351\117\103\176\207\312\047\030\146"
-"\236\265\301\100\145\175\374\141\157\255\233\162\317\251\136\330"
-"\363\371\332\156\221\020\372\114\265\352\176\040\336\251\071\057"
-"\365\210\344\212\157\065\306\040\234\053\206\106\063\012\374\061"
-"\125\245\153\254\026\100\351\315\065\131\157\062\004\303\173\265"
-"\017\173\167\160\363\110\273\052\122\202\316\257\051\155\361\021"
-"\157\155\346\007\000\001\357\232\363\046\015\246\171\023\147\257"
-"\370\253\034\165\254\221\265\153\276\100\260\336\234\014\261\151"
-"\205\031\161\221\023\105\312\337\321\375\346\262\312\226\203\171"
-"\333\305\270\252\133\172\220\013\170\126\076\306\327\237\224\110"
-"\021\365\255\002\003\001\000\001\243\132\060\130\060\022\006\003"
-"\125\035\023\001\001\377\004\010\060\006\001\001\377\002\001\005"
-"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006"
-"\060\027\006\003\125\035\040\004\020\060\016\060\014\006\012\052"
-"\206\110\206\371\017\012\001\005\001\060\031\006\003\125\035\016"
-"\004\022\004\020\127\107\065\173\066\047\021\250\010\374\057\106"
-"\045\353\044\151\060\015\006\011\052\206\110\206\367\015\001\001"
-"\005\005\000\003\202\001\001\000\307\141\105\250\212\161\271\276"
-"\064\351\041\173\041\315\126\023\230\325\060\143\351\030\252\113"
-"\222\025\277\013\035\273\354\222\151\305\056\303\141\213\350\060"
-"\105\313\020\106\301\163\070\134\213\031\322\053\363\100\353\174"
-"\162\263\056\036\047\343\165\225\212\034\233\056\304\225\005\206"
-"\162\320\125\364\241\222\122\171\134\333\364\370\334\345\327\022"
-"\261\100\307\074\206\344\061\145\112\312\067\306\336\166\127\031"
-"\151\114\106\151\374\052\255\026\067\172\223\254\367\041\113\055"
-"\373\353\251\120\313\301\321\100\010\332\003\151\207\247\067\136"
-"\125\301\305\355\304\343\216\014\046\227\233\134\127\113\162\343"
-"\362\003\005\320\002\073\046\003\100\220\236\276\013\133\111\014"
-"\170\361\325\114\125\051\340\366\375\114\003\251\124\002\062\321"
-"\127\132\205\254\103\355\133\073\026\137\240\277\065\333\113\236"
-"\173\350\377\347\015\074\073\250\233\111\101\106\365\163\116\377"
-"\222\145\041\203\023\125\161\353\111\074\177\210\032\302\022\050"
-"\045\241\106\113\101\067\227\177\354\216\361\324\241\226\302\040"
-"\266\136\255\251\034\036\021\240"
-, (PRUint32)1032 }
-};
-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 *)"American Express Global CA", (PRUint32)27 },
-  { (void *)"\005\025\203\065\174\267\267\276\344\016\273\221\377\153\073\274"
-"\361\124\335\126"
-, (PRUint32)20 },
-  { (void *)"\143\033\146\223\214\363\146\313\074\171\127\334\005\111\352\333"
-, (PRUint32)16 },
-  { (void *)"\060\201\226\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\047\060\045\006\003\125\004\012\023\036\101\155\145\162\151"
-"\143\141\156\040\105\170\160\162\145\163\163\040\103\157\155\160"
-"\141\156\171\054\040\111\156\143\056\061\046\060\044\006\003\125"
-"\004\013\023\035\101\155\145\162\151\143\141\156\040\105\170\160"
-"\162\145\163\163\040\124\145\143\150\156\157\154\157\147\151\145"
-"\163\061\066\060\064\006\003\125\004\003\023\055\101\155\145\162"
-"\151\143\141\156\040\105\170\160\162\145\163\163\040\107\154\157"
-"\142\141\154\040\103\145\162\164\151\146\151\143\141\164\145\040"
-"\101\165\164\150\157\162\151\164\171"
-, (PRUint32)153 },
-  { (void *)"\000\205"
-, (PRUint32)2 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
-};
-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 *)"Equifax Premium CA", (PRUint32)19 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\117\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"
-"\170\061\056\060\054\006\003\125\004\013\023\045\105\161\165\151"
-"\146\141\170\040\120\162\145\155\151\165\155\040\103\145\162\164"
-"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
-"\171"
-, (PRUint32)81 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\117\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"
-"\170\061\056\060\054\006\003\125\004\013\023\045\105\161\165\151"
-"\146\141\170\040\120\162\145\155\151\165\155\040\103\145\162\164"
-"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
-"\171"
-, (PRUint32)81 },
-  { (void *)"\065\341\357\036"
-, (PRUint32)4 },
-  { (void *)"\060\202\003\043\060\202\002\214\240\003\002\001\002\002\004\065"
-"\341\357\036\060\015\006\011\052\206\110\206\367\015\001\001\005"
-"\005\000\060\117\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\170\061\056\060\054\006\003\125\004\013\023\045\105\161"
-"\165\151\146\141\170\040\120\162\145\155\151\165\155\040\103\145"
-"\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162"
-"\151\164\171\060\036\027\015\071\070\060\070\062\064\062\062\065"
-"\064\062\063\132\027\015\061\070\060\070\062\064\062\062\065\064"
-"\062\063\132\060\117\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\170\061\056\060\054\006\003\125\004\013\023\045\105"
-"\161\165\151\146\141\170\040\120\162\145\155\151\165\155\040\103"
-"\145\162\164\151\146\151\143\141\164\145\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\316\241\006\216\006\314\010\013\301\206\250\336\040\325\015"
-"\016\321\015\304\237\352\152\331\263\302\062\107\100\157\212\210"
-"\244\011\275\070\054\035\346\313\346\244\363\066\353\332\353\274"
-"\374\144\263\007\366\055\274\252\316\237\031\110\150\112\374\365"
-"\242\105\176\011\020\365\217\263\111\134\043\006\071\352\023\213"
-"\270\013\315\221\035\166\137\331\067\241\104\373\137\220\362\147"
-"\263\315\030\231\103\037\166\022\153\002\362\225\203\070\103\302"
-"\366\142\064\312\311\170\135\137\322\330\272\232\377\276\020\140"
-"\133\002\003\001\000\001\243\202\001\012\060\202\001\006\060\161"
-"\006\003\125\035\037\004\152\060\150\060\146\240\144\240\142\244"
-"\140\060\136\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\170\061\056\060\054\006\003\125\004\013\023\045\105\161\165"
-"\151\146\141\170\040\120\162\145\155\151\165\155\040\103\145\162"
-"\164\151\146\151\143\141\164\145\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\032\006\003\125\035\020\004\023\060\021\201\017\062\060"
-"\061\070\060\070\062\064\062\062\065\064\062\063\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\025\356\262\050\131\253\156\345\370"
-"\317\213\201\364\044\341\256\077\165\033\230\060\035\006\003\125"
-"\035\016\004\026\004\024\025\356\262\050\131\253\156\345\370\317"
-"\213\201\364\044\341\256\077\165\033\230\060\014\006\003\125\035"
-"\023\004\005\060\003\001\001\377\060\032\006\011\052\206\110\206"
-"\366\175\007\101\000\004\015\060\013\033\005\126\063\056\060\143"
-"\003\002\006\300\060\015\006\011\052\206\110\206\367\015\001\001"
-"\005\005\000\003\201\201\000\275\013\234\047\251\003\333\050\334"
-"\230\251\113\320\321\216\247\250\032\132\221\340\234\361\367\030"
-"\174\056\042\236\066\037\311\250\265\315\106\112\156\372\065\007"
-"\033\206\010\353\237\342\250\371\235\101\055\072\256\134\134\266"
-"\137\064\004\353\374\052\140\260\373\164\344\205\351\145\070\226"
-"\356\025\307\306\167\143\022\275\212\150\037\253\154\175\332\312"
-"\134\023\316\352\311\353\011\134\305\163\347\022\001\325\331\123"
-"\007\236\340\017\226\360\213\264\273\105\110\237\206\305\031\125"
-"\240\313\226\305\003\374\110"
-, (PRUint32)807 }
-};
-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 *)"Equifax Premium CA", (PRUint32)19 },
-  { (void *)"\235\021\167\273\103\333\275\240\007\310\252\321\253\220\127\020"
-"\256\170\244\135"
-, (PRUint32)20 },
-  { (void *)"\251\351\250\235\016\163\343\261\057\067\015\350\110\077\206\355"
-, (PRUint32)16 },
-  { (void *)"\060\117\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"
-"\170\061\056\060\054\006\003\125\004\013\023\045\105\161\165\151"
-"\146\141\170\040\120\162\145\155\151\165\155\040\103\145\162\164"
-"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
-"\171"
-, (PRUint32)81 },
-  { (void *)"\065\341\357\036"
-, (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) }
-};
-static const NSSItem nss_builtins_items_30 [] = {
+static const NSSItem nss_builtins_items_18 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (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"
@@ -2183,17 +1427,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_31 [] = {
+static const NSSItem nss_builtins_items_19 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (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 },
@@ -2206,522 +1450,17 @@ static const NSSItem nss_builtins_items_
 "\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171"
 , (PRUint32)80 },
   { (void *)"\065\336\364\317"
 , (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) }
 };
-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 *)"BelSign Object Publishing CA", (PRUint32)29 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\273\061\013\060\011\006\003\125\004\006\023\002\102\105"
-"\061\021\060\017\006\003\125\004\007\023\010\102\162\165\163\163"
-"\145\154\163\061\023\060\021\006\003\125\004\012\023\012\102\145"
-"\154\123\151\147\156\040\116\126\061\070\060\066\006\003\125\004"
-"\013\023\057\102\145\154\123\151\147\156\040\117\142\152\145\143"
-"\164\040\120\165\142\154\151\163\150\151\156\147\040\103\145\162"
-"\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151"
-"\164\171\061\045\060\043\006\003\125\004\003\023\034\102\145\154"
-"\123\151\147\156\040\117\142\152\145\143\164\040\120\165\142\154"
-"\151\163\150\151\156\147\040\103\101\061\043\060\041\006\011\052"
-"\206\110\206\367\015\001\011\001\026\024\167\145\142\155\141\163"
-"\164\145\162\100\142\145\154\163\151\147\156\056\142\145"
-, (PRUint32)190 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\273\061\013\060\011\006\003\125\004\006\023\002\102\105"
-"\061\021\060\017\006\003\125\004\007\023\010\102\162\165\163\163"
-"\145\154\163\061\023\060\021\006\003\125\004\012\023\012\102\145"
-"\154\123\151\147\156\040\116\126\061\070\060\066\006\003\125\004"
-"\013\023\057\102\145\154\123\151\147\156\040\117\142\152\145\143"
-"\164\040\120\165\142\154\151\163\150\151\156\147\040\103\145\162"
-"\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151"
-"\164\171\061\045\060\043\006\003\125\004\003\023\034\102\145\154"
-"\123\151\147\156\040\117\142\152\145\143\164\040\120\165\142\154"
-"\151\163\150\151\156\147\040\103\101\061\043\060\041\006\011\052"
-"\206\110\206\367\015\001\011\001\026\024\167\145\142\155\141\163"
-"\164\145\162\100\142\145\154\163\151\147\156\056\142\145"
-, (PRUint32)190 },
-  { (void *)"\001"
-, (PRUint32)1 },
-  { (void *)"\060\202\003\003\060\202\002\154\240\003\002\001\002\002\001\001"
-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
-"\201\273\061\013\060\011\006\003\125\004\006\023\002\102\105\061"
-"\021\060\017\006\003\125\004\007\023\010\102\162\165\163\163\145"
-"\154\163\061\023\060\021\006\003\125\004\012\023\012\102\145\154"
-"\123\151\147\156\040\116\126\061\070\060\066\006\003\125\004\013"
-"\023\057\102\145\154\123\151\147\156\040\117\142\152\145\143\164"
-"\040\120\165\142\154\151\163\150\151\156\147\040\103\145\162\164"
-"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
-"\171\061\045\060\043\006\003\125\004\003\023\034\102\145\154\123"
-"\151\147\156\040\117\142\152\145\143\164\040\120\165\142\154\151"
-"\163\150\151\156\147\040\103\101\061\043\060\041\006\011\052\206"
-"\110\206\367\015\001\011\001\026\024\167\145\142\155\141\163\164"
-"\145\162\100\142\145\154\163\151\147\156\056\142\145\060\036\027"
-"\015\071\067\060\071\061\071\062\062\060\063\060\060\132\027\015"
-"\060\067\060\071\061\071\062\062\060\063\060\060\132\060\201\273"
-"\061\013\060\011\006\003\125\004\006\023\002\102\105\061\021\060"
-"\017\006\003\125\004\007\023\010\102\162\165\163\163\145\154\163"
-"\061\023\060\021\006\003\125\004\012\023\012\102\145\154\123\151"
-"\147\156\040\116\126\061\070\060\066\006\003\125\004\013\023\057"
-"\102\145\154\123\151\147\156\040\117\142\152\145\143\164\040\120"
-"\165\142\154\151\163\150\151\156\147\040\103\145\162\164\151\146"
-"\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061"
-"\045\060\043\006\003\125\004\003\023\034\102\145\154\123\151\147"
-"\156\040\117\142\152\145\143\164\040\120\165\142\154\151\163\150"
-"\151\156\147\040\103\101\061\043\060\041\006\011\052\206\110\206"
-"\367\015\001\011\001\026\024\167\145\142\155\141\163\164\145\162"
-"\100\142\145\154\163\151\147\156\056\142\145\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\304\056\037\266\277\356\202\100"
-"\335\371\267\056\101\325\236\005\261\132\320\046\174\142\125\003"
-"\233\374\313\141\336\113\357\376\350\231\376\207\271\210\317\220"
-"\332\017\011\074\166\337\027\227\266\313\077\045\105\375\264\274"
-"\130\000\276\260\132\266\024\207\217\356\147\144\255\035\210\203"
-"\273\147\237\145\141\000\130\010\200\120\237\200\311\061\366\052"
-"\220\034\055\367\112\154\020\366\043\103\135\070\011\140\210\127"
-"\002\315\026\154\030\374\315\373\222\052\167\320\236\223\243\135"
-"\210\144\320\310\370\135\124\121\002\003\001\000\001\243\025\060"
-"\023\060\021\006\011\140\206\110\001\206\370\102\001\001\004\004"
-"\003\002\000\007\060\015\006\011\052\206\110\206\367\015\001\001"
-"\004\005\000\003\201\201\000\143\166\027\174\226\360\123\245\135"
-"\001\034\123\316\051\302\176\165\254\114\015\242\010\163\264\152"
-"\061\375\002\006\024\231\334\124\004\244\277\310\226\206\237\061"
-"\103\062\045\127\366\205\366\045\273\067\276\241\171\043\311\127"
-"\006\045\161\153\105\117\370\364\002\100\026\202\042\257\124\352"
-"\062\050\366\015\356\231\272\113\010\121\017\156\206\043\041\114"
-"\055\045\210\201\304\056\016\361\023\054\070\212\225\002\044\303"
-"\072\225\143\344\223\216\110\273\010\107\162\137\256\346\072\132"
-"\107\326\161\306\236\232\122"
-, (PRUint32)775 }
-};
-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 *)"BelSign Object Publishing CA", (PRUint32)29 },
-  { (void *)"\373\224\125\030\075\227\133\343\150\140\204\227\152\247\052\201"
-"\125\173\201\051"
-, (PRUint32)20 },
-  { (void *)"\212\002\370\337\270\341\204\237\132\302\140\044\145\321\163\373"
-, (PRUint32)16 },
-  { (void *)"\060\201\273\061\013\060\011\006\003\125\004\006\023\002\102\105"
-"\061\021\060\017\006\003\125\004\007\023\010\102\162\165\163\163"
-"\145\154\163\061\023\060\021\006\003\125\004\012\023\012\102\145"
-"\154\123\151\147\156\040\116\126\061\070\060\066\006\003\125\004"
-"\013\023\057\102\145\154\123\151\147\156\040\117\142\152\145\143"
-"\164\040\120\165\142\154\151\163\150\151\156\147\040\103\145\162"
-"\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151"
-"\164\171\061\045\060\043\006\003\125\004\003\023\034\102\145\154"
-"\123\151\147\156\040\117\142\152\145\143\164\040\120\165\142\154"
-"\151\163\150\151\156\147\040\103\101\061\043\060\041\006\011\052"
-"\206\110\206\367\015\001\011\001\026\024\167\145\142\155\141\163"
-"\164\145\162\100\142\145\154\163\151\147\156\056\142\145"
-, (PRUint32)190 },
-  { (void *)"\001"
-, (PRUint32)1 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
-};
-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 *)"BelSign Secure Server CA", (PRUint32)25 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\263\061\013\060\011\006\003\125\004\006\023\002\102\105"
-"\061\021\060\017\006\003\125\004\007\023\010\102\162\165\163\163"
-"\145\154\163\061\023\060\021\006\003\125\004\012\023\012\102\145"
-"\154\123\151\147\156\040\116\126\061\064\060\062\006\003\125\004"
-"\013\023\053\102\145\154\123\151\147\156\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\145\040\101\165\164\150\157\162\151\164\171\061\041"
-"\060\037\006\003\125\004\003\023\030\102\145\154\123\151\147\156"
-"\040\123\145\143\165\162\145\040\123\145\162\166\145\162\040\103"
-"\101\061\043\060\041\006\011\052\206\110\206\367\015\001\011\001"
-"\026\024\167\145\142\155\141\163\164\145\162\100\142\145\154\163"
-"\151\147\156\056\142\145"
-, (PRUint32)182 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\263\061\013\060\011\006\003\125\004\006\023\002\102\105"
-"\061\021\060\017\006\003\125\004\007\023\010\102\162\165\163\163"
-"\145\154\163\061\023\060\021\006\003\125\004\012\023\012\102\145"
-"\154\123\151\147\156\040\116\126\061\064\060\062\006\003\125\004"
-"\013\023\053\102\145\154\123\151\147\156\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\145\040\101\165\164\150\157\162\151\164\171\061\041"
-"\060\037\006\003\125\004\003\023\030\102\145\154\123\151\147\156"
-"\040\123\145\143\165\162\145\040\123\145\162\166\145\162\040\103"
-"\101\061\043\060\041\006\011\052\206\110\206\367\015\001\011\001"
-"\026\024\167\145\142\155\141\163\164\145\162\100\142\145\154\163"
-"\151\147\156\056\142\145"
-, (PRUint32)182 },
-  { (void *)"\001"
-, (PRUint32)1 },
-  { (void *)"\060\202\002\363\060\202\002\134\240\003\002\001\002\002\001\001"
-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
-"\201\263\061\013\060\011\006\003\125\004\006\023\002\102\105\061"
-"\021\060\017\006\003\125\004\007\023\010\102\162\165\163\163\145"
-"\154\163\061\023\060\021\006\003\125\004\012\023\012\102\145\154"
-"\123\151\147\156\040\116\126\061\064\060\062\006\003\125\004\013"
-"\023\053\102\145\154\123\151\147\156\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\145\040\101\165\164\150\157\162\151\164\171\061\041\060"
-"\037\006\003\125\004\003\023\030\102\145\154\123\151\147\156\040"
-"\123\145\143\165\162\145\040\123\145\162\166\145\162\040\103\101"
-"\061\043\060\041\006\011\052\206\110\206\367\015\001\011\001\026"
-"\024\167\145\142\155\141\163\164\145\162\100\142\145\154\163\151"
-"\147\156\056\142\145\060\036\027\015\071\067\060\067\061\066\062"
-"\062\060\060\065\064\132\027\015\060\067\060\067\061\066\062\062"
-"\060\060\065\064\132\060\201\263\061\013\060\011\006\003\125\004"
-"\006\023\002\102\105\061\021\060\017\006\003\125\004\007\023\010"
-"\102\162\165\163\163\145\154\163\061\023\060\021\006\003\125\004"
-"\012\023\012\102\145\154\123\151\147\156\040\116\126\061\064\060"
-"\062\006\003\125\004\013\023\053\102\145\154\123\151\147\156\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\145\040\101\165\164\150\157\162"
-"\151\164\171\061\041\060\037\006\003\125\004\003\023\030\102\145"
-"\154\123\151\147\156\040\123\145\143\165\162\145\040\123\145\162"
-"\166\145\162\040\103\101\061\043\060\041\006\011\052\206\110\206"
-"\367\015\001\011\001\026\024\167\145\142\155\141\163\164\145\162"
-"\100\142\145\154\163\151\147\156\056\142\145\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\001\022\170\222\370\004\102"
-"\177\311\307\042\203\374\174\107\160\060\053\111\013\076\066\100"
-"\220\050\332\041\163\203\123\362\304\321\026\100\300\123\377\256"
-"\246\306\044\263\047\155\245\263\075\071\167\135\250\006\366\346"
-"\351\274\143\021\116\006\145\160\012\235\223\371\242\100\213\177"
-"\112\204\016\215\026\261\326\314\010\144\022\014\340\050\113\310"
-"\245\204\220\027\373\021\106\056\326\247\205\030\313\030\256\143"
-"\232\260\130\006\364\000\317\370\304\011\032\065\014\241\371\356"
-"\112\375\155\336\376\046\245\073\002\003\001\000\001\243\025\060"
-"\023\060\021\006\011\140\206\110\001\206\370\102\001\001\004\004"
-"\003\002\000\240\060\015\006\011\052\206\110\206\367\015\001\001"
-"\004\005\000\003\201\201\000\154\075\231\303\005\342\035\312\345"
-"\055\252\150\205\213\100\061\040\146\023\150\346\130\072\211\320"
-"\215\165\262\305\142\330\175\202\217\367\331\062\201\167\366\065"
-"\133\205\051\316\147\262\271\274\053\031\170\317\363\207\375\106"
-"\361\225\165\262\011\127\003\060\301\172\315\162\107\161\200\312"
-"\175\235\311\145\074\107\021\042\175\372\007\013\050\170\241\223"
-"\350\005\105\110\342\062\062\112\075\350\123\034\020\267\307\163"
-"\214\007\120\341\371\311\053\123\101\365\203\215\345\011\071\112"
-"\216\003\142\252\100\143\213"
-, (PRUint32)759 }
-};
-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 *)"BelSign Secure Server CA", (PRUint32)25 },
-  { (void *)"\302\305\265\376\203\144\370\243\156\170\035\174\025\010\174\350"
-"\205\241\206\230"
-, (PRUint32)20 },
-  { (void *)"\075\136\202\306\331\255\331\213\223\153\014\020\271\111\012\261"
-, (PRUint32)16 },
-  { (void *)"\060\201\263\061\013\060\011\006\003\125\004\006\023\002\102\105"
-"\061\021\060\017\006\003\125\004\007\023\010\102\162\165\163\163"
-"\145\154\163\061\023\060\021\006\003\125\004\012\023\012\102\145"
-"\154\123\151\147\156\040\116\126\061\064\060\062\006\003\125\004"
-"\013\023\053\102\145\154\123\151\147\156\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\145\040\101\165\164\150\157\162\151\164\171\061\041"
-"\060\037\006\003\125\004\003\023\030\102\145\154\123\151\147\156"
-"\040\123\145\143\165\162\145\040\123\145\162\166\145\162\040\103"
-"\101\061\043\060\041\006\011\052\206\110\206\367\015\001\011\001"
-"\026\024\167\145\142\155\141\163\164\145\162\100\142\145\154\163"
-"\151\147\156\056\142\145"
-, (PRUint32)182 },
-  { (void *)"\001"
-, (PRUint32)1 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
-};
-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 *)"TC TrustCenter, Germany, Class 0 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"
-"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
-"\142\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124"
-"\103\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157"
-"\162\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141"
-"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
-"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
-"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
-"\060\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
-"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
-"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
-, (PRUint32)191 },
-  { (void *)"0", (PRUint32)2 },
-  { (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"
-"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
-"\142\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124"
-"\103\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157"
-"\162\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141"
-"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
-"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
-"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
-"\060\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
-"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
-"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
-, (PRUint32)191 },
-  { (void *)"\001"
-, (PRUint32)1 },
-  { (void *)"\060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\001"
-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\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\162"
-"\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155\142"
-"\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124\103"
-"\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157\162"
-"\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141\164"
-"\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110\061"
-"\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162\165"
-"\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040\060"
-"\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015\001"
-"\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145\100"
-"\164\162\165\163\164\143\145\156\164\145\162\056\144\145\060\036"
-"\027\015\071\070\060\063\060\071\061\063\065\064\064\070\132\027"
-"\015\060\065\061\062\063\061\061\063\065\064\064\070\132\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\162\147"
-"\061\020\060\016\006\003\125\004\007\023\007\110\141\155\142\165"
-"\162\147\061\072\060\070\006\003\125\004\012\023\061\124\103\040"
-"\124\162\165\163\164\103\145\156\164\145\162\040\146\157\162\040"
-"\123\145\143\165\162\151\164\171\040\151\156\040\104\141\164\141"
-"\040\116\145\164\167\157\162\153\163\040\107\155\142\110\061\042"
-"\060\040\006\003\125\004\013\023\031\124\103\040\124\162\165\163"
-"\164\103\145\156\164\145\162\040\103\154\141\163\163\040\060\040"
-"\103\101\061\051\060\047\006\011\052\206\110\206\367\015\001\011"
-"\001\026\032\143\145\162\164\151\146\151\143\141\164\145\100\164"
-"\162\165\163\164\143\145\156\164\145\162\056\144\145\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\337\175\346\276\277\325"
-"\360\057\155\116\016\321\340\215\013\177\073\124\350\212\342\260"
-"\237\050\305\212\306\271\263\063\047\365\047\312\032\114\124\022"
-"\153\264\262\106\263\035\113\263\364\041\013\113\002\056\241\302"
-"\064\234\205\240\304\170\021\333\333\153\047\053\011\052\030\116"
-"\100\314\237\161\031\147\231\164\242\174\077\301\330\213\043\310"
-"\143\073\212\041\253\134\336\036\364\215\334\264\030\303\005\163"
-"\364\152\264\241\372\001\010\053\001\017\155\067\133\252\070\206"
-"\147\071\327\345\137\372\344\176\314\243\002\003\001\000\001\243"
-"\202\001\103\060\202\001\077\060\100\006\011\140\206\110\001\206"
-"\370\102\001\003\004\063\026\061\150\164\164\160\163\072\057\057"
-"\167\167\167\056\164\162\165\163\164\143\145\156\164\145\162\056"
-"\144\145\057\143\147\151\055\142\151\156\057\143\150\145\143\153"
-"\055\162\145\166\056\143\147\151\077\060\100\006\011\140\206\110"
-"\001\206\370\102\001\004\004\063\026\061\150\164\164\160\163\072"
-"\057\057\167\167\167\056\164\162\165\163\164\143\145\156\164\145"
-"\162\056\144\145\057\143\147\151\055\142\151\156\057\143\150\145"
-"\143\153\055\162\145\166\056\143\147\151\077\060\074\006\011\140"
-"\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160"
-"\163\072\057\057\167\167\167\056\164\162\165\163\164\143\145\156"
-"\164\145\162\056\144\145\057\143\147\151\055\142\151\156\057\122"
-"\145\156\145\167\056\143\147\151\077\060\076\006\011\140\206\110"
-"\001\206\370\102\001\010\004\061\026\057\150\164\164\160\072\057"
-"\057\167\167\167\056\164\162\165\163\164\143\145\156\164\145\162"
-"\056\144\145\057\147\165\151\144\145\154\151\156\145\163\057\151"
-"\156\144\145\170\056\150\164\155\154\060\050\006\011\140\206\110"
-"\001\206\370\102\001\015\004\033\026\031\124\103\040\124\162\165"
-"\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040\060"
-"\040\103\101\060\021\006\011\140\206\110\001\206\370\102\001\001"
-"\004\004\003\002\000\007\060\015\006\011\052\206\110\206\367\015"
-"\001\001\004\005\000\003\201\201\000\115\007\177\137\011\060\031"
-"\222\252\005\107\172\224\165\124\052\256\317\374\330\014\102\341"
-"\105\070\053\044\225\262\312\207\312\171\304\303\227\220\136\142"
-"\030\306\311\070\141\114\150\065\323\114\024\021\353\304\315\241"
-"\251\330\305\236\150\047\062\007\065\105\004\370\137\041\240\140"
-"\036\034\000\110\004\130\322\305\313\256\155\062\156\075\167\225"
-"\214\205\307\345\256\120\235\165\112\173\377\013\047\171\352\115"
-"\244\131\377\354\132\352\046\245\071\203\244\321\170\316\247\251"
-"\176\274\335\053\312\022\223\003\112"
-, (PRUint32)1081 }
-};
-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 *)"TC TrustCenter, Germany, Class 0 CA", (PRUint32)36 },
-  { (void *)"\104\201\247\326\311\104\165\204\317\355\212\107\311\256\152\360"
-"\036\071\165\030"
-, (PRUint32)20 },
-  { (void *)"\065\205\111\216\156\127\376\275\227\361\311\106\043\072\266\175"
-, (PRUint32)16 },
-  { (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"
-"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
-"\142\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124"
-"\103\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157"
-"\162\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141"
-"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
-"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
-"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
-"\060\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
-"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
-"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
-, (PRUint32)191 },
-  { (void *)"\001"
-, (PRUint32)1 },
-  { (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) }
-};
-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 *)"TC TrustCenter, Germany, Class 1 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"
-"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
-"\142\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124"
-"\103\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157"
-"\162\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141"
-"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
-"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
-"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
-"\061\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
-"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
-"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
-, (PRUint32)191 },
-  { (void *)"0", (PRUint32)2 },
-  { (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"
-"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
-"\142\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124"
-"\103\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157"
-"\162\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141"
-"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
-"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
-"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
-"\061\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
-"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
-"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
-, (PRUint32)191 },
-  { (void *)"\002"
-, (PRUint32)1 },
-  { (void *)"\060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\002"
-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\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\162"
-"\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155\142"
-"\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124\103"
-"\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157\162"
-"\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141\164"
-"\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110\061"
-"\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162\165"
-"\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040\061"
-"\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015\001"
-"\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145\100"
-"\164\162\165\163\164\143\145\156\164\145\162\056\144\145\060\036"
-"\027\015\071\070\060\063\060\071\061\063\065\066\063\063\132\027"
-"\015\060\065\061\062\063\061\061\063\065\066\063\063\132\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\162\147"
-"\061\020\060\016\006\003\125\004\007\023\007\110\141\155\142\165"
-"\162\147\061\072\060\070\006\003\125\004\012\023\061\124\103\040"
-"\124\162\165\163\164\103\145\156\164\145\162\040\146\157\162\040"
-"\123\145\143\165\162\151\164\171\040\151\156\040\104\141\164\141"
-"\040\116\145\164\167\157\162\153\163\040\107\155\142\110\061\042"
-"\060\040\006\003\125\004\013\023\031\124\103\040\124\162\165\163"
-"\164\103\145\156\164\145\162\040\103\154\141\163\163\040\061\040"
-"\103\101\061\051\060\047\006\011\052\206\110\206\367\015\001\011"
-"\001\026\032\143\145\162\164\151\146\151\143\141\164\145\100\164"
-"\162\165\163\164\143\145\156\164\145\162\056\144\145\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\260\051\353\264\166\263"
-"\256\327\266\133\264\136\347\275\343\261\234\111\004\127\133\241"
-"\253\331\177\023\033\375\272\141\253\330\347\161\337\055\000\224"
-"\135\121\110\175\043\357\165\142\204\220\074\012\037\131\021\164"
-"\057\216\200\245\375\060\002\075\051\122\315\162\032\111\041\234"
-"\274\313\122\216\110\241\143\226\310\020\205\060\151\127\164\105"
-"\300\132\206\306\325\075\340\150\127\175\061\152\044\215\105\227"
-"\076\061\176\150\146\062\156\044\155\354\062\066\311\101\312\360"
-"\061\104\310\243\141\312\033\240\066\037\002\003\001\000\001\243"
-"\202\001\103\060\202\001\077\060\100\006\011\140\206\110\001\206"
-"\370\102\001\003\004\063\026\061\150\164\164\160\163\072\057\057"
-"\167\167\167\056\164\162\165\163\164\143\145\156\164\145\162\056"
-"\144\145\057\143\147\151\055\142\151\156\057\143\150\145\143\153"
-"\055\162\145\166\056\143\147\151\077\060\100\006\011\140\206\110"
-"\001\206\370\102\001\004\004\063\026\061\150\164\164\160\163\072"
-"\057\057\167\167\167\056\164\162\165\163\164\143\145\156\164\145"
-"\162\056\144\145\057\143\147\151\055\142\151\156\057\143\150\145"
-"\143\153\055\162\145\166\056\143\147\151\077\060\074\006\011\140"
-"\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160"
-"\163\072\057\057\167\167\167\056\164\162\165\163\164\143\145\156"
-"\164\145\162\056\144\145\057\143\147\151\055\142\151\156\057\122"
-"\145\156\145\167\056\143\147\151\077\060\076\006\011\140\206\110"
-"\001\206\370\102\001\010\004\061\026\057\150\164\164\160\072\057"
-"\057\167\167\167\056\164\162\165\163\164\143\145\156\164\145\162"
-"\056\144\145\057\147\165\151\144\145\154\151\156\145\163\057\151"
-"\156\144\145\170\056\150\164\155\154\060\050\006\011\140\206\110"
-"\001\206\370\102\001\015\004\033\026\031\124\103\040\124\162\165"
-"\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040\061"
-"\040\103\101\060\021\006\011\140\206\110\001\206\370\102\001\001"
-"\004\004\003\002\000\007\060\015\006\011\052\206\110\206\367\015"
-"\001\001\004\005\000\003\201\201\000\005\102\122\046\244\014\047"
-"\001\104\254\134\045\050\302\104\102\124\010\271\035\305\076\154"
-"\131\146\304\263\116\120\247\370\370\226\165\241\226\165\350\026"
-"\070\240\315\135\156\372\171\247\033\173\035\036\303\000\271\146"
-"\276\132\326\142\017\347\362\173\270\357\114\340\300\077\131\256"
-"\071\267\204\011\236\253\361\251\056\153\151\342\255\314\362\352"
-"\170\011\005\040\070\102\161\030\176\307\262\227\346\325\002\005"
-"\006\126\243\137\361\252\302\304\117\376\367\357\026\017\235\354"
-"\252\205\317\075\051\044\361\004\315"
-, (PRUint32)1081 }
-};
-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 *)"TC TrustCenter, Germany, Class 1 CA", (PRUint32)36 },
-  { (void *)"\332\300\131\013\015\224\374\025\327\025\056\266\171\160\003\133"
-"\215\271\365\053"
-, (PRUint32)20 },
-  { (void *)"\144\077\370\076\122\024\112\131\272\223\126\004\013\043\002\321"
-, (PRUint32)16 },
-  { (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"
-"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
-"\142\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124"
-"\103\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157"
-"\162\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141"
-"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
-"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
-"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
-"\061\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
-"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
-"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
-, (PRUint32)191 },
-  { (void *)"\002"
-, (PRUint32)1 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
-};
-static const NSSItem nss_builtins_items_40 [] = {
+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 *)"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"
@@ -2817,17 +1556,17 @@ static const NSSItem nss_builtins_items_
 "\224\013\331\213\126\107\364\273\347\305\137\173\364\143\114\256"
 "\174\064\352\015\242\251\263\054\205\363\343\376\047\124\020\222"
 "\260\217\222\301\230\102\030\160\110\333\116\054\353\015\044\150"
 "\344\321\367\276\011\251\051\207\273\350\332\334\076\243\210\102"
 "\061\365\321\343\177\256\330\216\000\132\164\230\260\117\306\377"
 "\043\173\134\163\000\170\311\333\116"
 , (PRUint32)1081 }
 };
-static const NSSItem nss_builtins_items_41 [] = {
+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 *)"TC TrustCenter, Germany, Class 2 CA", (PRUint32)36 },
   { (void *)"\312\135\207\155\025\113\162\350\014\357\331\346\353\234\366\215"
 "\002\037\253\354"
 , (PRUint32)20 },
@@ -2847,17 +1586,17 @@ static const NSSItem nss_builtins_items_
 "\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
 , (PRUint32)191 },
   { (void *)"\002"
 , (PRUint32)1 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_42 [] = {
+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 *)"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"
@@ -2953,17 +1692,17 @@ static const NSSItem nss_builtins_items_
 "\312\042\367\221\335\074\066\131\232\233\165\367\274\344\310\355"
 "\354\002\266\042\247\363\054\361\310\222\170\155\266\356\305\050"
 "\354\200\040\117\271\153\010\347\057\247\206\036\175\261\010\237"
 "\124\271\000\067\074\240\330\032\310\226\034\364\062\024\234\071"
 "\225\267\356\360\103\111\302\136\350\313\171\157\123\277\373\111"
 "\212\054\330\113\331\125\362\022\160"
 , (PRUint32)1081 }
 };
-static const NSSItem nss_builtins_items_43 [] = {
+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 *)"TC TrustCenter, Germany, Class 3 CA", (PRUint32)36 },
   { (void *)"\227\057\340\037\171\136\221\210\026\371\201\161\176\162\355\040"
 "\241\377\020\143"
 , (PRUint32)20 },
@@ -2983,153 +1722,17 @@ static const NSSItem nss_builtins_items_
 "\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
 , (PRUint32)191 },
   { (void *)"\004"
 , (PRUint32)1 },
   { (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) }
 };
-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 *)"TC TrustCenter, Germany, Class 4 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"
-"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
-"\142\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124"
-"\103\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157"
-"\162\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141"
-"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
-"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
-"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
-"\064\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
-"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
-"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
-, (PRUint32)191 },
-  { (void *)"0", (PRUint32)2 },
-  { (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"
-"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
-"\142\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124"
-"\103\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157"
-"\162\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141"
-"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
-"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
-"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
-"\064\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
-"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
-"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
-, (PRUint32)191 },
-  { (void *)"\005"
-, (PRUint32)1 },
-  { (void *)"\060\202\004\065\060\202\003\236\240\003\002\001\002\002\001\005"
-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\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\162"
-"\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155\142"
-"\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124\103"
-"\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157\162"
-"\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141\164"
-"\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110\061"
-"\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162\165"
-"\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040\064"
-"\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015\001"
-"\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145\100"
-"\164\162\165\163\164\143\145\156\164\145\162\056\144\145\060\036"
-"\027\015\071\070\060\063\060\071\061\064\060\060\062\060\132\027"
-"\015\060\065\061\062\063\061\061\064\060\060\062\060\132\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\162\147"
-"\061\020\060\016\006\003\125\004\007\023\007\110\141\155\142\165"
-"\162\147\061\072\060\070\006\003\125\004\012\023\061\124\103\040"
-"\124\162\165\163\164\103\145\156\164\145\162\040\146\157\162\040"
-"\123\145\143\165\162\151\164\171\040\151\156\040\104\141\164\141"
-"\040\116\145\164\167\157\162\153\163\040\107\155\142\110\061\042"
-"\060\040\006\003\125\004\013\023\031\124\103\040\124\162\165\163"
-"\164\103\145\156\164\145\162\040\103\154\141\163\163\040\064\040"
-"\103\101\061\051\060\047\006\011\052\206\110\206\367\015\001\011"
-"\001\026\032\143\145\162\164\151\146\151\143\141\164\145\100\164"
-"\162\165\163\164\143\145\156\164\145\162\056\144\145\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\277\057\143\326\066\173"
-"\262\015\323\125\365\144\154\346\045\135\306\264\310\024\272\045"
-"\070\203\353\126\142\245\125\251\145\243\364\043\231\302\113\271"
-"\320\315\124\147\246\243\240\243\251\063\053\166\344\275\255\167"
-"\262\355\134\022\164\303\305\266\017\122\232\162\223\103\220\142"
-"\146\025\017\105\245\335\340\335\270\157\100\156\127\301\171\162"
-"\243\140\252\272\166\035\022\211\123\132\374\002\276\341\011\023"
-"\305\112\057\334\075\213\031\255\327\213\044\105\373\114\364\315"
-"\134\065\035\051\114\121\363\362\154\125\002\003\001\000\001\243"
-"\202\001\103\060\202\001\077\060\100\006\011\140\206\110\001\206"
-"\370\102\001\003\004\063\026\061\150\164\164\160\163\072\057\057"
-"\167\167\167\056\164\162\165\163\164\143\145\156\164\145\162\056"
-"\144\145\057\143\147\151\055\142\151\156\057\143\150\145\143\153"
-"\055\162\145\166\056\143\147\151\077\060\100\006\011\140\206\110"
-"\001\206\370\102\001\004\004\063\026\061\150\164\164\160\163\072"
-"\057\057\167\167\167\056\164\162\165\163\164\143\145\156\164\145"
-"\162\056\144\145\057\143\147\151\055\142\151\156\057\143\150\145"
-"\143\153\055\162\145\166\056\143\147\151\077\060\074\006\011\140"
-"\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160"
-"\163\072\057\057\167\167\167\056\164\162\165\163\164\143\145\156"
-"\164\145\162\056\144\145\057\143\147\151\055\142\151\156\057\122"
-"\145\156\145\167\056\143\147\151\077\060\076\006\011\140\206\110"
-"\001\206\370\102\001\010\004\061\026\057\150\164\164\160\072\057"
-"\057\167\167\167\056\164\162\165\163\164\143\145\156\164\145\162"
-"\056\144\145\057\147\165\151\144\145\154\151\156\145\163\057\151"
-"\156\144\145\170\056\150\164\155\154\060\050\006\011\140\206\110"
-"\001\206\370\102\001\015\004\033\026\031\124\103\040\124\162\165"
-"\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040\064"
-"\040\103\101\060\021\006\011\140\206\110\001\206\370\102\001\001"
-"\004\004\003\002\000\007\060\015\006\011\052\206\110\206\367\015"
-"\001\001\004\005\000\003\201\201\000\224\150\024\033\045\236\051"
-"\231\261\262\043\322\104\263\225\237\321\236\125\004\335\343\057"
-"\202\063\125\226\167\031\235\053\236\145\034\372\212\343\307\217"
-"\045\374\261\036\125\106\017\217\377\117\067\057\244\166\131\246"
-"\144\353\325\026\160\275\335\225\063\014\244\015\044\353\144\120"
-"\264\103\021\362\103\276\015\161\230\042\354\001\257\354\367\307"
-"\134\161\303\165\221\130\031\350\335\240\364\264\361\274\020\112"
-"\363\223\264\006\111\273\037\146\322\275\164\107\341\232\371\353"
-"\327\253\155\037\272\341\035\054\332"
-, (PRUint32)1081 }
-};
-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 *)"TC TrustCenter, Germany, Class 4 CA", (PRUint32)36 },
-  { (void *)"\161\162\311\174\001\016\161\014\375\350\321\363\171\263\300\074"
-"\253\116\274\235"
-, (PRUint32)20 },
-  { (void *)"\277\257\354\304\332\371\060\371\312\065\312\045\344\077\215\211"
-, (PRUint32)16 },
-  { (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"
-"\162\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155"
-"\142\165\162\147\061\072\060\070\006\003\125\004\012\023\061\124"
-"\103\040\124\162\165\163\164\103\145\156\164\145\162\040\146\157"
-"\162\040\123\145\143\165\162\151\164\171\040\151\156\040\104\141"
-"\164\141\040\116\145\164\167\157\162\153\163\040\107\155\142\110"
-"\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124\162"
-"\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163\040"
-"\064\040\103\101\061\051\060\047\006\011\052\206\110\206\367\015"
-"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
-"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
-, (PRUint32)191 },
-  { (void *)"\005"
-, (PRUint32)1 },
-  { (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) }
-};
-static const NSSItem nss_builtins_items_46 [] = {
+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 *)"ABAecom (sub., Am. Bankers Assn.) Root CA", (PRUint32)42 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\211\061\013\060\011\006\003\125\004\006\023\002\125\123"
 "\061\013\060\011\006\003\125\004\010\023\002\104\103\061\023\060"
@@ -3212,17 +1815,17 @@ static const NSSItem nss_builtins_items_
 "\171\237\174\042\110\253\106\315\333\263\206\054\217\277\005\101"
 "\323\301\343\024\343\101\027\046\320\174\247\161\114\031\350\112"
 "\017\162\130\061\175\354\140\172\243\042\050\275\031\044\140\077"
 "\073\207\163\300\153\344\313\256\267\253\045\103\262\125\055\173"
 "\253\006\016\165\135\064\345\135\163\155\236\262\165\100\245\131"
 "\311\117\061\161\210\331\210\177\124"
 , (PRUint32)953 }
 };
-static const NSSItem nss_builtins_items_47 [] = {
+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 *)"ABAecom (sub., Am. Bankers Assn.) Root CA", (PRUint32)42 },
   { (void *)"\172\164\101\017\260\315\134\227\052\066\113\161\277\003\035\210"
 "\246\121\016\236"
 , (PRUint32)20 },
@@ -3240,17 +1843,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)140 },
   { (void *)"\000\320\036\100\220\000\000\106\122\000\000\000\001\000\000\000"
 "\004"
 , (PRUint32)17 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_48 [] = {
+static const NSSItem nss_builtins_items_26 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Digital Signature Trust Co. Global CA 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"
@@ -3315,17 +1918,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_49 [] = {
+static const NSSItem nss_builtins_items_27 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Digital Signature Trust Co. Global CA 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 },
@@ -3338,17 +1941,17 @@ static const NSSItem nss_builtins_items_
 "\104\123\124\103\101\040\105\061"
 , (PRUint32)72 },
   { (void *)"\066\160\025\226"
 , (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) }
 };
-static const NSSItem nss_builtins_items_50 [] = {
+static const NSSItem nss_builtins_items_28 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Digital Signature Trust Co. Global CA 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"
@@ -3413,17 +2016,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_51 [] = {
+static const NSSItem nss_builtins_items_29 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Digital Signature Trust Co. Global CA 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 },
@@ -3436,17 +2039,17 @@ static const NSSItem nss_builtins_items_
 "\104\123\124\103\101\040\105\062"
 , (PRUint32)72 },
   { (void *)"\066\156\323\316"
 , (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) }
 };
-static const NSSItem nss_builtins_items_52 [] = {
+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 *)"Digital Signature Trust Co. Global CA 2", (PRUint32)40 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163"
 "\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061"
@@ -3535,17 +2138,17 @@ static const NSSItem nss_builtins_items_
 "\366\076\171\374\350\346\260\165\355\356\075\311\160\307\135\252"
 "\201\113\106\045\034\307\154\025\343\225\116\017\252\062\067\224"
 "\012\027\044\222\023\204\130\322\143\157\053\367\346\133\142\013"
 "\023\027\260\015\122\114\376\376\157\134\342\221\156\035\375\244"
 "\142\327\150\372\216\172\117\322\010\332\223\334\360\222\021\172"
 "\320\334\162\223\014\163\223\142\205\150\320\364"
 , (PRUint32)988 }
 };
-static const NSSItem nss_builtins_items_53 [] = {
+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 *)"Digital Signature Trust Co. Global CA 2", (PRUint32)40 },
   { (void *)"\267\057\377\222\322\316\103\336\012\215\114\124\214\120\067\046"
 "\250\036\053\223"
 , (PRUint32)20 },
@@ -3565,17 +2168,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)172 },
   { (void *)"\000\320\036\100\213\000\000\002\174\000\000\000\002\000\000\000"
 "\001"
 , (PRUint32)17 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_54 [] = {
+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 *)"Digital Signature Trust Co. Global CA 4", (PRUint32)40 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\251\061\013\060\011\006\003\125\004\006\023\002\165\163"
 "\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061"
@@ -3664,17 +2267,17 @@ static const NSSItem nss_builtins_items_
 "\061\164\173\374\077\061\247\320\107\163\063\071\033\314\116\152"
 "\327\111\203\021\006\376\353\202\130\063\062\114\360\126\254\036"
 "\234\057\126\232\173\301\112\034\245\375\125\066\316\374\226\115"
 "\364\260\360\354\267\154\202\355\057\061\231\102\114\251\262\015"
 "\270\025\135\361\337\272\311\265\112\324\144\230\263\046\251\060"
 "\310\375\246\354\253\226\041\255\177\302\170\266"
 , (PRUint32)988 }
 };
-static const NSSItem nss_builtins_items_55 [] = {
+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 *)"Digital Signature Trust Co. Global CA 4", (PRUint32)40 },
   { (void *)"\147\353\063\173\150\114\353\016\302\260\166\012\264\210\047\214"
 "\335\225\227\335"
 , (PRUint32)20 },
@@ -3694,112 +2297,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)172 },
   { (void *)"\000\320\036\100\213\000\000\167\155\000\000\000\001\000\000\000"
 "\004"
 , (PRUint32)17 },
   { (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) }
 };
-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 *)"Deutsche Telekom AG Root CA", (PRUint32)28 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\155\061\013\060\011\006\003\125\004\006\023\002\104\105\061"
-"\034\060\032\006\003\125\004\012\023\023\104\145\165\164\163\143"
-"\150\145\040\124\145\154\145\153\157\155\040\101\107\061\035\060"
-"\033\006\003\125\004\013\023\024\124\145\154\145\123\145\143\040"
-"\124\162\165\163\164\040\103\145\156\164\145\162\061\041\060\037"
-"\006\003\125\004\003\023\030\104\145\165\164\163\143\150\145\040"
-"\124\145\154\145\153\157\155\040\122\157\157\164\040\103\101"
-, (PRUint32)111 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\155\061\013\060\011\006\003\125\004\006\023\002\104\105\061"
-"\034\060\032\006\003\125\004\012\023\023\104\145\165\164\163\143"
-"\150\145\040\124\145\154\145\153\157\155\040\101\107\061\035\060"
-"\033\006\003\125\004\013\023\024\124\145\154\145\123\145\143\040"
-"\124\162\165\163\164\040\103\145\156\164\145\162\061\041\060\037"
-"\006\003\125\004\003\023\030\104\145\165\164\163\143\150\145\040"
-"\124\145\154\145\153\157\155\040\122\157\157\164\040\103\101"
-, (PRUint32)111 },
-  { (void *)"\006"
-, (PRUint32)1 },
-  { (void *)"\060\202\002\216\060\202\001\367\240\003\002\001\002\002\001\006"
-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
-"\155\061\013\060\011\006\003\125\004\006\023\002\104\105\061\034"
-"\060\032\006\003\125\004\012\023\023\104\145\165\164\163\143\150"
-"\145\040\124\145\154\145\153\157\155\040\101\107\061\035\060\033"
-"\006\003\125\004\013\023\024\124\145\154\145\123\145\143\040\124"
-"\162\165\163\164\040\103\145\156\164\145\162\061\041\060\037\006"
-"\003\125\004\003\023\030\104\145\165\164\163\143\150\145\040\124"
-"\145\154\145\153\157\155\040\122\157\157\164\040\103\101\060\036"
-"\027\015\071\070\061\062\060\071\060\071\061\061\060\060\132\027"
-"\015\060\064\061\062\060\071\062\063\065\071\060\060\132\060\155"
-"\061\013\060\011\006\003\125\004\006\023\002\104\105\061\034\060"
-"\032\006\003\125\004\012\023\023\104\145\165\164\163\143\150\145"
-"\040\124\145\154\145\153\157\155\040\101\107\061\035\060\033\006"
-"\003\125\004\013\023\024\124\145\154\145\123\145\143\040\124\162"
-"\165\163\164\040\103\145\156\164\145\162\061\041\060\037\006\003"
-"\125\004\003\023\030\104\145\165\164\163\143\150\145\040\124\145"
-"\154\145\153\157\155\040\122\157\157\164\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\335\005\054\371\005\263"
-"\271\022\327\151\161\367\352\126\060\010\127\024\103\173\273\032"
-"\234\155\057\127\141\327\342\365\104\153\356\066\101\226\366\144"
-"\316\341\301\262\271\244\024\004\230\120\350\160\370\216\065\232"
-"\175\111\301\141\035\131\256\332\006\030\225\175\255\316\354\251"
-"\276\321\030\017\100\221\166\052\243\345\375\376\211\025\364\127"
-"\367\340\125\332\165\255\000\364\054\301\065\314\264\103\046\125"
-"\142\104\056\001\045\234\212\133\360\301\320\000\065\170\376\065"
-"\336\224\100\144\170\203\241\314\071\211\002\003\001\000\001\243"
-"\076\060\074\060\017\006\003\125\035\023\004\010\060\006\001\001"
-"\377\002\001\005\060\016\006\003\125\035\017\001\001\377\004\004"
-"\003\002\001\006\060\031\006\003\125\035\016\004\022\004\020\054"
-"\207\131\037\213\023\200\262\371\206\235\076\022\176\130\226\060"
-"\015\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201"
-"\201\000\017\376\163\265\007\210\157\240\013\211\352\312\120\037"
-"\224\336\224\053\013\047\136\117\365\034\225\046\332\214\226\124"
-"\255\031\221\067\103\135\253\311\213\263\315\157\230\071\075\355"
-"\335\065\343\161\267\355\023\223\203\350\206\345\051\063\023\023"
-"\274\065\173\375\050\057\160\131\325\323\264\215\050\023\131\073"
-"\310\325\164\371\105\302\007\140\252\270\030\124\371\245\150\377"
-"\327\005\325\217\266\005\061\056\101\112\364\020\037\140\107\032"
-"\013\213\031\115\222\127\040\322\357\120\031\350\315\320\160\274"
-"\274\066"
-, (PRUint32)658 }
-};
-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 *)"Deutsche Telekom AG Root CA", (PRUint32)28 },
-  { (void *)"\342\023\044\000\203\106\103\235\143\067\021\170\043\310\065\246"
-"\354\113\316\102"
-, (PRUint32)20 },
-  { (void *)"\167\336\004\224\167\320\014\137\247\261\364\060\030\207\373\125"
-, (PRUint32)16 },
-  { (void *)"\060\155\061\013\060\011\006\003\125\004\006\023\002\104\105\061"
-"\034\060\032\006\003\125\004\012\023\023\104\145\165\164\163\143"
-"\150\145\040\124\145\154\145\153\157\155\040\101\107\061\035\060"
-"\033\006\003\125\004\013\023\024\124\145\154\145\123\145\143\040"
-"\124\162\165\163\164\040\103\145\156\164\145\162\061\041\060\037"
-"\006\003\125\004\003\023\030\104\145\165\164\163\143\150\145\040"
-"\124\145\154\145\153\157\155\040\122\157\157\164\040\103\101"
-, (PRUint32)111 },
-  { (void *)"\006"
-, (PRUint32)1 },
-  { (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) }
-};
-static const NSSItem nss_builtins_items_58 [] = {
+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 *)"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"
@@ -3855,17 +2363,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_59 [] = {
+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 *)"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 },
@@ -3881,17 +2389,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)97 },
   { (void *)"\000\315\272\177\126\360\337\344\274\124\376\042\254\263\162\252"
 "\125"
 , (PRUint32)17 },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_60 [] = {
+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 *)"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"
@@ -3945,17 +2453,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_61 [] = {
+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 *)"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 },
@@ -3970,17 +2478,17 @@ static const NSSItem nss_builtins_items_
 "\171"
 , (PRUint32)97 },
   { (void *)"\055\033\374\112\027\215\243\221\353\347\377\365\213\105\276\013"
 , (PRUint32)16 },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_62 [] = {
+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 *)"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"
@@ -4034,17 +2542,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_63 [] = {
+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 *)"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 },
@@ -4059,17 +2567,17 @@ static const NSSItem nss_builtins_items_
 "\171"
 , (PRUint32)97 },
   { (void *)"\160\272\344\035\020\331\051\064\266\070\312\173\003\314\272\277"
 , (PRUint32)16 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_64 [] = {
+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 - 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"
@@ -4148,17 +2656,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_65 [] = {
+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 - 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 },
@@ -4179,17 +2687,17 @@ static const NSSItem nss_builtins_items_
 "\167\157\162\153"
 , (PRUint32)196 },
   { (void *)"\114\307\352\252\230\076\161\323\223\020\370\075\072\211\221\222"
 , (PRUint32)16 },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_66 [] = {
+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 - 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"
@@ -4269,17 +2777,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_67 [] = {
+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 - 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 },
@@ -4301,17 +2809,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)196 },
   { (void *)"\000\271\057\140\314\210\237\241\172\106\011\270\133\160\154\212"
 "\257"
 , (PRUint32)17 },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_68 [] = {
+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 - 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"
@@ -4390,17 +2898,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_69 [] = {
+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 - 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 },
@@ -4421,17 +2929,17 @@ static const NSSItem nss_builtins_items_
 "\167\157\162\153"
 , (PRUint32)196 },
   { (void *)"\175\331\376\007\317\250\036\267\020\171\147\373\247\211\064\306"
 , (PRUint32)16 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_70 [] = {
+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 - 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"
@@ -4510,17 +3018,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_71 [] = {
+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 - 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 },
@@ -4541,17 +3049,17 @@ static const NSSItem nss_builtins_items_
 "\167\157\162\153"
 , (PRUint32)196 },
   { (void *)"\062\210\216\232\322\365\353\023\107\370\177\304\040\067\045\370"
 , (PRUint32)16 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_72 [] = {
+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 *)"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"
@@ -4623,17 +3131,17 @@ static const NSSItem nss_builtins_items_
 "\257\010\260\141\064\214\323\230\251\103\064\366\017\207\051\073"
 "\235\302\126\130\230\167\303\367\033\254\366\235\370\076\252\247"
 "\124\105\360\365\371\325\061\145\376\153\130\234\161\263\036\327"
 "\122\352\062\027\374\100\140\035\311\171\044\262\366\154\375\250"
 "\146\016\202\335\230\313\332\302\104\117\056\240\173\362\367\153"
 "\054\166\021\204\106\212\170\243\343"
 , (PRUint32)889 }
 };
-static const NSSItem nss_builtins_items_73 [] = {
+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 *)"GlobalSign Root CA", (PRUint32)19 },
   { (void *)"\057\027\077\175\351\226\147\257\245\172\370\012\242\321\261\057"
 "\254\203\003\070"
 , (PRUint32)20 },
@@ -4647,457 +3155,17 @@ static const NSSItem nss_builtins_items_
 "\156\040\122\157\157\164\040\103\101"
 , (PRUint32)89 },
   { (void *)"\002\000\000\000\000\000\326\170\267\224\005"
 , (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) }
 };
-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 *)"GlobalSign Partners CA", (PRUint32)23 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\137\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"
-"\123\151\147\156\040\156\166\055\163\141\061\024\060\022\006\003"
-"\125\004\013\023\013\120\141\162\164\156\145\162\163\040\103\101"
-"\061\037\060\035\006\003\125\004\003\023\026\107\154\157\142\141"
-"\154\123\151\147\156\040\120\141\162\164\156\145\162\163\040\103"
-"\101"
-, (PRUint32)97 },
-  { (void *)"0", (PRUint32)2 },
-  { (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"
-"\123\151\147\156\040\156\166\055\163\141\061\020\060\016\006\003"
-"\125\004\013\023\007\122\157\157\164\040\103\101\061\033\060\031"
-"\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147"
-"\156\040\122\157\157\164\040\103\101"
-, (PRUint32)89 },
-  { (void *)"\002\000\000\000\000\000\326\170\271\321\257"
-, (PRUint32)11 },
-  { (void *)"\060\202\003\236\060\202\002\206\240\003\002\001\002\002\013\002"
-"\000\000\000\000\000\326\170\271\321\257\060\015\006\011\052\206"
-"\110\206\367\015\001\001\004\005\000\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\123\151\147\156\040\156\166"
-"\055\163\141\061\020\060\016\006\003\125\004\013\023\007\122\157"
-"\157\164\040\103\101\061\033\060\031\006\003\125\004\003\023\022"
-"\107\154\157\142\141\154\123\151\147\156\040\122\157\157\164\040"
-"\103\101\060\036\027\015\071\071\060\061\062\070\061\062\060\060"
-"\060\060\132\027\015\060\071\060\061\062\070\061\062\060\060\060"
-"\060\132\060\137\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\123\151\147\156\040\156\166\055\163\141\061\024\060\022"
-"\006\003\125\004\013\023\013\120\141\162\164\156\145\162\163\040"
-"\103\101\061\037\060\035\006\003\125\004\003\023\026\107\154\157"
-"\142\141\154\123\151\147\156\040\120\141\162\164\156\145\162\163"
-"\040\103\101\060\202\001\042\060\015\006\011\052\206\110\206\367"
-"\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002"
-"\202\001\001\000\322\054\370\062\254\112\022\172\067\310\051\221"
-"\245\256\214\156\036\016\300\064\063\210\345\063\161\026\034\170"
-"\204\150\303\030\064\120\056\026\076\261\224\202\117\261\232\237"
-"\000\370\306\021\065\306\151\173\230\002\255\000\006\210\154\347"
-"\114\063\050\000\210\047\106\037\207\263\161\165\143\274\062\273"
-"\210\336\146\030\016\120\006\223\264\366\274\024\067\060\075\042"
-"\337\075\377\165\176\331\012\032\305\237\263\374\320\254\263\010"
-"\172\211\323\001\350\000\134\347\112\013\075\115\173\046\242\267"
-"\142\006\213\332\106\335\223\027\077\077\133\002\113\013\266\210"
-"\040\021\222\000\255\273\307\056\324\343\105\256\365\211\132\174"
-"\215\244\255\205\144\062\300\047\214\306\362\212\200\222\206\044"
-"\126\131\215\164\150\242\203\102\263\236\075\120\101\206\157\040"
-"\156\366\375\316\323\031\343\062\314\217\355\232\136\155\037\050"
-"\365\122\254\156\030\136\370\075\321\222\345\272\154\001\210\113"
-"\012\362\055\336\145\063\005\102\240\114\252\061\166\276\375\277"
-"\201\170\371\161\034\106\136\055\025\225\055\060\131\216\114\101"
-"\321\142\253\075\002\003\001\000\001\243\143\060\141\060\016\006"
-"\003\125\035\017\001\001\377\004\004\003\002\000\006\060\035\006"
-"\003\125\035\016\004\026\004\024\103\044\215\160\025\010\142\125"
-"\234\117\014\100\027\135\206\136\017\242\114\373\060\037\006\003"
-"\125\035\043\004\030\060\026\200\024\140\173\146\032\105\015\227"
-"\312\211\120\057\175\004\315\064\250\377\374\375\113\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\202\001"
-"\001\000\146\355\264\210\151\021\231\202\041\203\254\241\155\213"
-"\233\204\255\017\055\310\036\214\312\173\176\255\252\324\216\336"
-"\007\326\236\105\307\245\270\234\007\071\140\045\125\032\300\117"
-"\031\345\317\027\051\111\211\030\065\146\345\353\050\100\116\127"
-"\311\257\263\344\270\040\005\243\073\225\120\221\111\224\051\175"
-"\054\345\210\101\245\105\210\136\235\202\047\367\322\357\133\265"
-"\117\237\276\376\065\145\054\125\144\237\341\121\332\042\141\167"
-"\272\130\116\217\306\171\131\131\156\060\200\242\117\220\156\041"
-"\013\255\320\150\071\220\020\233\355\042\145\157\036\021\070\346"
-"\177\214\322\363\071\155\107\325\041\350\352\165\072\101\321\255"
-"\366\026\235\135\013\041\275\363\037\143\006\045\035\301\037\065"
-"\161\054\353\040\031\325\301\260\354\075\345\157\355\002\007\077"
-"\023\173\146\222\326\104\301\230\367\137\120\213\172\133\302\157"
-"\155\260\321\370\345\164\240\100\067\243\045\017\344\075\312\144"
-"\061\223\220\134\060\173\271\071\061\232\136\114\315\271\101\117"
-"\120\344\075\070\256\310\146\331\307\073\135\121\107\254\233\253"
-"\362\255"
-, (PRUint32)930 }
-};
-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 *)"GlobalSign Partners CA", (PRUint32)23 },
-  { (void *)"\204\304\217\000\351\221\354\336\333\264\030\251\213\357\241\172"
-"\107\355\162\230"
-, (PRUint32)20 },
-  { (void *)"\074\165\315\114\275\251\320\212\171\117\120\026\067\204\364\053"
-, (PRUint32)16 },
-  { (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"
-"\123\151\147\156\040\156\166\055\163\141\061\020\060\016\006\003"
-"\125\004\013\023\007\122\157\157\164\040\103\101\061\033\060\031"
-"\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147"
-"\156\040\122\157\157\164\040\103\101"
-, (PRUint32)89 },
-  { (void *)"\002\000\000\000\000\000\326\170\271\321\257"
-, (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) }
-};
-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 *)"GlobalSign Primary Class 1 CA", (PRUint32)30 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\155\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"
-"\123\151\147\156\040\156\166\055\163\141\061\033\060\031\006\003"
-"\125\004\013\023\022\120\162\151\155\141\162\171\040\103\154\141"
-"\163\163\040\061\040\103\101\061\046\060\044\006\003\125\004\003"
-"\023\035\107\154\157\142\141\154\123\151\147\156\040\120\162\151"
-"\155\141\162\171\040\103\154\141\163\163\040\061\040\103\101"
-, (PRUint32)111 },
-  { (void *)"0", (PRUint32)2 },
-  { (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"
-"\123\151\147\156\040\156\166\055\163\141\061\020\060\016\006\003"
-"\125\004\013\023\007\122\157\157\164\040\103\101\061\033\060\031"
-"\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147"
-"\156\040\122\157\157\164\040\103\101"
-, (PRUint32)89 },
-  { (void *)"\002\000\000\000\000\000\326\170\270\067\317"
-, (PRUint32)11 },
-  { (void *)"\060\202\003\254\060\202\002\224\240\003\002\001\002\002\013\002"
-"\000\000\000\000\000\326\170\270\067\317\060\015\006\011\052\206"
-"\110\206\367\015\001\001\004\005\000\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\123\151\147\156\040\156\166"
-"\055\163\141\061\020\060\016\006\003\125\004\013\023\007\122\157"
-"\157\164\040\103\101\061\033\060\031\006\003\125\004\003\023\022"
-"\107\154\157\142\141\154\123\151\147\156\040\122\157\157\164\040"
-"\103\101\060\036\027\015\071\070\060\071\061\065\061\062\060\060"
-"\060\060\132\027\015\060\071\060\061\062\070\061\062\060\060\060"
-"\060\132\060\155\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\123\151\147\156\040\156\166\055\163\141\061\033\060\031"
-"\006\003\125\004\013\023\022\120\162\151\155\141\162\171\040\103"
-"\154\141\163\163\040\061\040\103\101\061\046\060\044\006\003\125"
-"\004\003\023\035\107\154\157\142\141\154\123\151\147\156\040\120"
-"\162\151\155\141\162\171\040\103\154\141\163\163\040\061\040\103"
-"\101\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\275\040\065\107\321\050\326\010\243\022\071\043\107\015"
-"\275\160\041\122\016\127\061\225\246\064\127\153\354\176\103\171"
-"\303\006\122\110\315\274\265\241\231\275\330\037\062\274\317\327"
-"\156\162\155\056\167\042\220\202\116\113\217\232\014\001\102\232"
-"\331\160\131\266\235\037\346\143\321\014\255\035\116\370\205\201"
-"\371\256\357\237\246\122\141\104\171\032\165\105\340\141\126\105"
-"\155\102\214\075\162\313\246\244\022\267\232\365\326\140\320\140"
-"\120\263\216\246\246\354\264\364\022\315\177\250\316\357\263\341"
-"\205\060\376\162\304\346\347\167\263\236\130\101\326\121\203\210"
-"\007\306\266\151\117\066\336\321\013\110\077\275\326\237\041\164"
-"\144\157\047\006\076\113\375\016\246\233\277\244\110\127\214\220"
-"\356\211\030\013\002\201\030\276\147\376\123\140\210\047\272\243"
-"\163\064\113\132\126\264\336\163\005\355\230\226\135\354\112\347"
-"\100\374\113\011\142\353\320\343\061\117\205\321\172\253\131\147"
-"\053\373\210\017\353\252\203\275\065\375\141\047\354\146\016\102"
-"\127\367\151\302\014\357\374\152\302\156\111\332\217\101\070\256"
-"\110\251\002\003\001\000\001\243\143\060\141\060\016\006\003\125"
-"\035\017\001\001\377\004\004\003\002\000\006\060\035\006\003\125"
-"\035\016\004\026\004\024\374\340\146\366\132\065\231\353\100\036"
-"\322\270\036\103\274\230\216\037\212\303\060\037\006\003\125\035"
-"\043\004\030\060\026\200\024\140\173\146\032\105\015\227\312\211"
-"\120\057\175\004\315\064\250\377\374\375\113\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\202\001\001\000"
-"\233\243\010\104\316\362\220\235\161\363\062\263\005\152\265\352"
-"\317\051\230\336\125\076\240\026\175\006\172\104\326\257\322\372"
-"\023\130\214\370\034\307\253\035\264\033\357\151\150\230\134\010"
-"\071\217\340\367\373\110\314\041\347\270\063\333\005\252\064\044"
-"\154\112\345\351\173\140\336\203\263\037\012\276\101\165\374\314"
-"\060\110\267\301\046\035\004\063\252\266\170\355\052\313\272\126"
-"\227\062\156\367\061\225\056\106\362\024\356\047\307\367\142\211"
-"\271\134\132\323\070\212\144\365\067\264\361\263\064\162\325\325"
-"\041\075\113\327\170\223\327\061\146\065\036\243\330\107\111\157"
-"\034\255\341\200\177\370\230\044\154\163\254\016\302\032\167\002"
-"\243\046\007\267\307\153\135\274\202\325\052\110\035\143\317\120"
-"\062\246\373\034\030\107\025\012\133\014\134\070\044\232\004\230"
-"\250\010\110\137\174\064\207\143\253\055\215\114\000\167\224\033"
-"\166\272\365\026\030\243\025\257\057\224\366\051\000\166\301\025"
-"\027\323\351\067\115\166\324\313\113\051\131\044\254\332\112\240"
-"\352\143\336\137\124\261\372\363\321\105\313\305\144\264\163\041"
-, (PRUint32)944 }
-};
-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 *)"GlobalSign Primary Class 1 CA", (PRUint32)30 },
-  { (void *)"\353\061\124\315\041\226\363\125\022\053\211\147\267\163\002\102"
-"\355\321\336\113"
-, (PRUint32)20 },
-  { (void *)"\134\254\131\001\244\206\123\313\020\146\265\326\326\161\377\001"
-, (PRUint32)16 },
-  { (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"
-"\123\151\147\156\040\156\166\055\163\141\061\020\060\016\006\003"
-"\125\004\013\023\007\122\157\157\164\040\103\101\061\033\060\031"
-"\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147"
-"\156\040\122\157\157\164\040\103\101"
-, (PRUint32)89 },
-  { (void *)"\002\000\000\000\000\000\326\170\270\067\317"
-, (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) }
-};
-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 *)"GlobalSign Primary Class 2 CA", (PRUint32)30 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\155\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"
-"\123\151\147\156\040\156\166\055\163\141\061\033\060\031\006\003"
-"\125\004\013\023\022\120\162\151\155\141\162\171\040\103\154\141"
-"\163\163\040\062\040\103\101\061\046\060\044\006\003\125\004\003"
-"\023\035\107\154\157\142\141\154\123\151\147\156\040\120\162\151"
-"\155\141\162\171\040\103\154\141\163\163\040\062\040\103\101"
-, (PRUint32)111 },
-  { (void *)"0", (PRUint32)2 },
-  { (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"
-"\123\151\147\156\040\156\166\055\163\141\061\020\060\016\006\003"
-"\125\004\013\023\007\122\157\157\164\040\103\101\061\033\060\031"
-"\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147"
-"\156\040\122\157\157\164\040\103\101"
-, (PRUint32)89 },
-  { (void *)"\002\000\000\000\000\000\326\170\270\215\215"
-, (PRUint32)11 },
-  { (void *)"\060\202\003\254\060\202\002\224\240\003\002\001\002\002\013\002"
-"\000\000\000\000\000\326\170\270\215\215\060\015\006\011\052\206"
-"\110\206\367\015\001\001\004\005\000\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\123\151\147\156\040\156\166"
-"\055\163\141\061\020\060\016\006\003\125\004\013\023\007\122\157"
-"\157\164\040\103\101\061\033\060\031\006\003\125\004\003\023\022"
-"\107\154\157\142\141\154\123\151\147\156\040\122\157\157\164\040"
-"\103\101\060\036\027\015\071\071\060\061\062\070\061\062\060\060"
-"\060\060\132\027\015\060\071\060\061\062\070\061\062\060\060\060"
-"\060\132\060\155\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\123\151\147\156\040\156\166\055\163\141\061\033\060\031"
-"\006\003\125\004\013\023\022\120\162\151\155\141\162\171\040\103"
-"\154\141\163\163\040\062\040\103\101\061\046\060\044\006\003\125"
-"\004\003\023\035\107\154\157\142\141\154\123\151\147\156\040\120"
-"\162\151\155\141\162\171\040\103\154\141\163\163\040\062\040\103"
-"\101\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\222\214\376\357\364\105\216\027\101\156\374\330\277\041"
-"\157\253\006\235\122\301\054\000\235\077\216\205\270\177\112\217"
-"\275\240\143\052\312\111\047\256\132\202\364\164\342\125\222\377"
-"\302\321\252\171\242\266\372\325\235\202\004\117\306\262\306\136"
-"\143\247\072\272\330\356\353\212\157\237\266\273\050\101\300\042"
-"\373\116\110\032\006\222\327\277\327\317\271\331\275\070\117\073"
-"\015\104\156\125\101\376\374\011\333\330\277\363\216\041\361\350"
-"\022\265\366\023\245\323\306\114\223\042\260\002\377\356\035\014"
-"\304\250\153\117\165\150\126\350\334\050\022\120\367\250\044\235"
-"\056\044\071\373\011\005\336\345\243\144\111\041\320\150\176\161"
-"\060\221\261\140\340\071\364\120\370\172\115\230\000\153\174\171"
-"\272\116\316\112\342\272\066\035\267\305\066\025\225\234\144\102"
-"\352\137\304\272\365\100\005\276\341\072\131\275\204\247\031\270"
-"\336\115\123\120\316\007\321\322\121\323\357\015\201\154\346\347"
-"\155\313\135\174\077\174\314\354\117\203\047\045\377\160\120\366"
-"\203\131\165\204\006\146\130\054\336\211\215\000\246\111\371\245"
-"\103\167\002\003\001\000\001\243\143\060\141\060\016\006\003\125"
-"\035\017\001\001\377\004\004\003\002\000\006\060\035\006\003\125"
-"\035\016\004\026\004\024\174\347\262\261\054\336\261\247\153\351"
-"\166\014\341\243\375\116\154\307\271\366\060\037\006\003\125\035"
-"\043\004\030\060\026\200\024\140\173\146\032\105\015\227\312\211"
-"\120\057\175\004\315\064\250\377\374\375\113\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\202\001\001\000"
-"\143\335\131\316\212\171\252\230\235\116\305\211\144\067\176\212"
-"\223\147\057\020\352\157\047\303\215\167\155\362\134\126\224\031"
-"\032\151\140\060\106\135\217\362\155\105\074\216\065\227\174\057"
-"\270\121\342\350\211\275\210\317\047\034\010\064\134\210\301\150"
-"\044\333\221\205\344\317\373\373\103\215\350\045\001\033\304\016"
-"\367\000\102\110\206\037\044\010\130\132\214\215\362\153\107\054"
-"\150\221\261\151\102\375\015\215\311\046\346\222\206\246\144\156"
-"\222\305\316\076\074\175\161\343\043\244\253\307\325\250\251\337"
-"\202\247\073\350\206\325\303\117\030\343\104\320\340\334\363\305"
-"\150\056\376\245\057\005\204\310\176\107\102\123\153\207\112\376"
-"\062\377\136\076\160\214\267\250\025\314\027\302\377\106\354\320"
-"\354\055\264\156\022\050\251\371\100\351\353\324\146\227\123\251"
-"\151\125\300\251\252\262\056\315\321\151\364\276\370\273\174\151"
-"\356\124\246\333\236\373\132\246\076\376\232\357\224\121\113\165"
-"\356\330\324\341\232\361\002\126\023\211\016\247\102\213\226\213"
-"\205\014\033\205\276\046\256\253\246\231\274\042\361\163\337\102"
-, (PRUint32)944 }
-};
-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 *)"GlobalSign Primary Class 2 CA", (PRUint32)30 },
-  { (void *)"\203\376\336\325\161\343\226\317\307\144\367\073\337\026\166\207"
-"\162\305\037\314"
-, (PRUint32)20 },
-  { (void *)"\251\251\102\131\176\276\132\224\344\054\306\213\034\052\104\266"
-, (PRUint32)16 },
-  { (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"
-"\123\151\147\156\040\156\166\055\163\141\061\020\060\016\006\003"
-"\125\004\013\023\007\122\157\157\164\040\103\101\061\033\060\031"
-"\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147"
-"\156\040\122\157\157\164\040\103\101"
-, (PRUint32)89 },
-  { (void *)"\002\000\000\000\000\000\326\170\270\215\215"
-, (PRUint32)11 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
-};
-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 *)"GlobalSign Primary Class 3 CA", (PRUint32)30 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\155\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"
-"\123\151\147\156\040\156\166\055\163\141\061\033\060\031\006\003"
-"\125\004\013\023\022\120\162\151\155\141\162\171\040\103\154\141"
-"\163\163\040\063\040\103\101\061\046\060\044\006\003\125\004\003"
-"\023\035\107\154\157\142\141\154\123\151\147\156\040\120\162\151"
-"\155\141\162\171\040\103\154\141\163\163\040\063\040\103\101"
-, (PRUint32)111 },
-  { (void *)"0", (PRUint32)2 },
-  { (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"
-"\123\151\147\156\040\156\166\055\163\141\061\020\060\016\006\003"
-"\125\004\013\023\007\122\157\157\164\040\103\101\061\033\060\031"
-"\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147"
-"\156\040\122\157\157\164\040\103\101"
-, (PRUint32)89 },
-  { (void *)"\002\000\000\000\000\000\326\170\270\326\303"
-, (PRUint32)11 },
-  { (void *)"\060\202\003\254\060\202\002\224\240\003\002\001\002\002\013\002"
-"\000\000\000\000\000\326\170\270\326\303\060\015\006\011\052\206"
-"\110\206\367\015\001\001\004\005\000\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\123\151\147\156\040\156\166"
-"\055\163\141\061\020\060\016\006\003\125\004\013\023\007\122\157"
-"\157\164\040\103\101\061\033\060\031\006\003\125\004\003\023\022"
-"\107\154\157\142\141\154\123\151\147\156\040\122\157\157\164\040"
-"\103\101\060\036\027\015\071\071\060\061\062\070\061\062\060\060"
-"\060\060\132\027\015\060\071\060\061\062\070\061\062\060\060\060"
-"\060\132\060\155\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\123\151\147\156\040\156\166\055\163\141\061\033\060\031"
-"\006\003\125\004\013\023\022\120\162\151\155\141\162\171\040\103"
-"\154\141\163\163\040\063\040\103\101\061\046\060\044\006\003\125"
-"\004\003\023\035\107\154\157\142\141\154\123\151\147\156\040\120"
-"\162\151\155\141\162\171\040\103\154\141\163\163\040\063\040\103"
-"\101\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\221\136\126\145\326\300\300\004\234\277\107\304\134\173"
-"\172\061\001\371\130\226\231\343\034\204\057\334\126\217\255\365"
-"\131\201\325\103\146\135\132\223\214\165\312\251\347\021\301\121"
-"\020\024\140\311\054\324\173\257\306\167\206\253\172\047\256\157"
-"\225\271\013\312\266\106\373\176\032\364\015\024\155\322\311\116"
-"\262\256\360\124\366\134\100\114\066\110\164\350\124\214\145\146"
-"\020\247\275\053\267\040\215\005\111\255\170\175\322\044\043\120"
-"\343\360\264\171\233\001\071\377\257\073\323\055\356\341\111\215"
-"\215\057\074\152\101\105\057\233\343\075\341\022\344\221\165\236"
-"\317\240\076\074\222\201\157\212\056\030\334\340\362\214\214\375"
-"\207\331\007\364\100\224\311\116\117\103\337\147\126\157\275\003"
-"\120\174\231\147\244\271\074\221\154\002\156\204\326\374\106\367"
-"\314\157\030\076\027\360\357\013\144\026\127\346\254\206\361\110"
-"\252\103\301\311\047\170\163\104\105\342\205\175\272\377\263\341"
-"\373\033\005\244\113\073\231\022\045\001\120\024\152\257\135\352"
-"\310\014\356\344\332\354\113\213\134\150\023\225\334\303\265\060"
-"\072\327\002\003\001\000\001\243\143\060\141\060\016\006\003\125"
-"\035\017\001\001\377\004\004\003\002\000\006\060\035\006\003\125"
-"\035\016\004\026\004\024\314\066\314\027\264\105\221\057\355\317"
-"\073\060\110\167\373\265\024\231\276\343\060\037\006\003\125\035"
-"\043\004\030\060\026\200\024\140\173\146\032\105\015\227\312\211"
-"\120\057\175\004\315\064\250\377\374\375\113\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\202\001\001\000"
-"\127\262\124\314\275\225\027\144\140\211\266\123\221\014\105\222"
-"\303\075\250\154\303\314\262\030\365\170\101\164\330\175\243\047"
-"\257\167\015\131\076\224\035\151\372\211\323\014\275\032\001\364"
-"\077\350\340\167\032\202\050\132\346\142\327\267\343\066\311\016"
-"\237\172\343\302\323\314\131\211\014\357\026\213\360\066\167\042"
-"\312\244\266\267\301\102\147\001\100\143\314\347\070\144\207\133"
-"\024\226\146\173\055\024\356\275\111\155\377\167\320\342\116\133"
-"\323\200\302\115\017\312\270\235\201\227\247\064\156\307\343\234"
-"\110\345\264\252\105\365\366\145\114\110\362\022\302\322\223\214"
-"\302\025\044\363\053\122\377\343\010\256\270\156\326\054\022\317"
-"\071\313\022\052\347\251\173\137\230\075\243\341\314\246\143\211"
-"\134\175\061\165\371\325\326\135\362\320\324\075\337\236\161\250"
-"\016\334\344\040\227\170\346\177\123\244\015\121\117\216\073\003"
-"\256\243\015\132\115\303\171\347\065\130\160\102\311\136\241\136"
-"\264\331\042\243\104\123\065\244\320\317\163\200\305\317\237\126"
-"\230\166\371\024\114\167\207\202\311\334\176\135\064\325\066\165"
-, (PRUint32)944 }
-};
-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 *)"GlobalSign Primary Class 3 CA", (PRUint32)30 },
-  { (void *)"\164\003\311\063\110\252\304\367\016\051\364\320\025\022\364\106"
-"\111\017\165\214"
-, (PRUint32)20 },
-  { (void *)"\230\022\243\113\225\251\226\144\224\347\120\214\076\341\203\132"
-, (PRUint32)16 },
-  { (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"
-"\123\151\147\156\040\156\166\055\163\141\061\020\060\016\006\003"
-"\125\004\013\023\007\122\157\157\164\040\103\101\061\033\060\031"
-"\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147"
-"\156\040\122\157\157\164\040\103\101"
-, (PRUint32)89 },
-  { (void *)"\002\000\000\000\000\000\326\170\270\326\303"
-, (PRUint32)11 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
-};
-static const NSSItem nss_builtins_items_82 [] = {
+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 *)"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"
@@ -5172,17 +3240,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_83 [] = {
+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 *)"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 },
@@ -5202,17 +3270,17 @@ static const NSSItem nss_builtins_items_
 "\157\100\166\141\154\151\143\145\162\164\056\143\157\155"
 , (PRUint32)190 },
   { (void *)"\001"
 , (PRUint32)1 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_84 [] = {
+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 *)"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"
@@ -5287,17 +3355,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_85 [] = {
+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 *)"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 },
@@ -5317,22 +3385,22 @@ static const NSSItem nss_builtins_items_
 "\157\100\166\141\154\151\143\145\162\164\056\143\157\155"
 , (PRUint32)190 },
   { (void *)"\001"
 , (PRUint32)1 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_86 [] = {
+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 *)"ValiCert Class 3 VA", (PRUint32)20 },
+  { (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"
 "\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125"
 "\004\012\023\016\126\141\154\151\103\145\162\164\054\040\111\156"
 "\143\056\061\065\060\063\006\003\125\004\013\023\054\126\141\154"
 "\151\103\145\162\164\040\103\154\141\163\163\040\063\040\120\157"
 "\154\151\143\171\040\126\141\154\151\144\141\164\151\157\156\040"
@@ -5402,22 +3470,22 @@ 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_87 [] = {
+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 *)"ValiCert Class 3 VA", (PRUint32)20 },
+  { (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 },
   { (void *)"\242\157\123\267\356\100\333\112\150\347\372\030\331\020\113\162"
 , (PRUint32)16 },
   { (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"
 "\156\040\116\145\164\167\157\162\153\061\027\060\025\006\003\125"
@@ -5432,342 +3500,17 @@ static const NSSItem nss_builtins_items_
 "\157\100\166\141\154\151\143\145\162\164\056\143\157\155"
 , (PRUint32)190 },
   { (void *)"\001"
 , (PRUint32)1 },
   { (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) }
 };
-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 *)"Thawte Universal CA Root", (PRUint32)25 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\127\061\017\060\015\006\003\125\004\012\023\006\124\150\141"
-"\167\164\145\061\041\060\037\006\003\125\004\013\023\030\124\150"
-"\141\167\164\145\040\125\156\151\166\145\162\163\141\154\040\103"
-"\101\040\122\157\157\164\061\041\060\037\006\003\125\004\003\023"
-"\030\124\150\141\167\164\145\040\125\156\151\166\145\162\163\141"
-"\154\040\103\101\040\122\157\157\164"
-, (PRUint32)89 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\127\061\017\060\015\006\003\125\004\012\023\006\124\150\141"
-"\167\164\145\061\041\060\037\006\003\125\004\013\023\030\124\150"
-"\141\167\164\145\040\125\156\151\166\145\162\163\141\154\040\103"
-"\101\040\122\157\157\164\061\041\060\037\006\003\125\004\003\023"
-"\030\124\150\141\167\164\145\040\125\156\151\166\145\162\163\141"
-"\154\040\103\101\040\122\157\157\164"
-, (PRUint32)89 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (void *)"\060\202\021\042\060\202\011\012\002\001\000\060\015\006\011\052"
-"\206\110\206\367\015\001\001\005\005\000\060\127\061\017\060\015"
-"\006\003\125\004\012\023\006\124\150\141\167\164\145\061\041\060"
-"\037\006\003\125\004\013\023\030\124\150\141\167\164\145\040\125"
-"\156\151\166\145\162\163\141\154\040\103\101\040\122\157\157\164"
-"\061\041\060\037\006\003\125\004\003\023\030\124\150\141\167\164"
-"\145\040\125\156\151\166\145\162\163\141\154\040\103\101\040\122"
-"\157\157\164\060\036\027\015\071\071\061\062\060\065\061\063\065"
-"\066\060\065\132\027\015\063\067\060\064\060\063\061\063\065\066"
-"\060\065\132\060\127\061\017\060\015\006\003\125\004\012\023\006"
-"\124\150\141\167\164\145\061\041\060\037\006\003\125\004\013\023"
-"\030\124\150\141\167\164\145\040\125\156\151\166\145\162\163\141"
-"\154\040\103\101\040\122\157\157\164\061\041\060\037\006\003\125"
-"\004\003\023\030\124\150\141\167\164\145\040\125\156\151\166\145"
-"\162\163\141\154\040\103\101\040\122\157\157\164\060\202\010\042"
-"\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003"
-"\202\010\017\000\060\202\010\012\002\202\010\001\000\342\211\005"
-"\155\303\177\255\246\211\072\377\273\307\315\235\067\261\341\322"
-"\041\036\233\141\052\025\347\173\127\117\125\074\320\273\371\331"
-"\075\076\246\274\354\264\255\123\232\026\002\353\013\162\375\212"
-"\362\217\104\005\305\353\323\345\275\266\104\071\346\373\107\277"
-"\152\236\012\225\030\342\150\342\326\226\326\041\255\210\375\365"
-"\027\365\323\332\102\245\220\355\051\225\226\165\072\332\207\241"
-"\324\365\323\207\336\005\142\246\343\146\164\222\317\245\274\273"
-"\337\150\377\161\165\126\101\131\065\353\063\132\146\121\362\322"
-"\243\012\301\214\316\163\134\021\157\055\214\225\214\221\261\375"
-"\317\345\255\126\225\314\205\222\203\220\125\101\311\302\167\355"
-"\371\243\164\102\012\150\010\363\320\321\145\375\147\054\064\377"
-"\044\177\347\171\310\007\073\045\127\335\244\014\230\075\276\340"
-"\314\031\145\333\362\124\242\257\102\324\235\342\256\204\043\045"
-"\011\063\022\265\152\036\166\304\213\331\111\000\154\136\272\037"
-"\362\033\332\147\312\047\252\243\104\043\033\203\202\316\362\253"
-"\063\355\124\244\334\311\253\131\145\321\070\016\301\076\033\147"
-"\217\326\165\001\340\125\042\335\166\167\354\216\335\364\317\171"
-"\042\155\271\127\003\365\231\010\247\074\076\064\373\304\027\256"
-"\043\130\315\044\363\043\312\152\002\050\224\001\201\064\264\154"
-"\153\256\213\032\303\243\322\011\074\026\124\365\066\137\044\343"
-"\237\112\241\342\144\306\026\303\246\201\172\044\066\107\216\301"
-"\136\016\373\371\025\170\004\326\016\131\331\235\130\146\142\322"
-"\224\051\062\062\310\170\271\146\366\265\126\341\154\306\024\113"
-"\226\122\131\221\002\044\152\125\107\327\077\266\043\032\140\167"
-"\227\056\342\100\257\236\004\127\236\255\021\305\311\103\160\357"
-"\110\264\136\254\034\151\056\056\202\325\133\213\276\202\276\031"
-"\024\136\347\015\042\307\121\033\377\036\233\361\060\217\161\061"
-"\006\263\064\047\217\137\172\146\202\117\212\055\023\253\102\317"
-"\041\126\236\227\216\146\066\017\226\233\345\053\364\002\251\052"
-"\152\214\054\304\303\270\160\054\055\051\036\077\120\167\036\155"
-"\052\124\344\125\012\221\070\241\305\265\146\242\166\132\356\017"
-"\277\264\147\341\050\156\017\341\066\241\202\321\277\324\167\341"
-"\304\147\062\223\170\310\347\124\123\376\043\171\346\150\314\046"
-"\220\366\020\143\135\052\157\221\055\244\163\062\121\041\362\273"
-"\025\337\252\044\010\110\006\336\241\236\046\277\272\203\277\174"
-"\244\310\240\214\275\322\377\274\204\151\047\023\044\030\304\105"
-"\030\043\046\136\030\024\312\056\210\207\142\243\123\346\041\267"
-"\270\205\173\232\205\273\025\046\162\370\271\367\152\164\017\111"
-"\077\222\276\251\005\267\231\047\277\277\011\027\113\231\114\255"
-"\021\020\174\337\164\061\366\217\046\137\252\210\256\070\127\310"
-"\125\055\323\373\330\033\121\231\276\045\033\072\272\300\175\033"
-"\355\316\322\111\271\317\363\305\175\211\220\201\330\151\110\040"
-"\020\243\370\357\222\121\030\062\213\021\030\300\077\033\205\126"
-"\316\127\311\362\202\144\306\337\002\011\056\112\021\057\261\047"
-"\155\067\122\360\360\026\141\361\147\215\337\207\162\257\207\332"
-"\317\373\120\224\156\324\224\205\353\212\054\352\041\365\226\112"
-"\104\325\340\316\152\164\104\115\320\005\323\207\025\355\066\320"
-"\244\213\146\125\160\223\356\107\006\301\176\056\245\030\171\147"
-"\363\050\205\361\160\367\016\203\244\176\124\236\132\166\062\313"
-"\145\033\270\315\373\310\050\003\322\124\221\321\247\305\205\103"
-"\010\027\166\245\346\057\147\010\330\241\242\202\055\014\370\301"
-"\257\143\324\120\167\155\153\106\112\101\205\325\220\137\171\055"
-"\304\354\327\021\207\100\212\341\150\342\144\370\125\062\373\157"
-"\223\054\332\167\331\041\301\027\345\066\054\116\176\220\177\254"
-"\224\053\062\147\276\070\120\166\270\256\101\271\327\041\305\011"
-"\114\140\310\243\121\304\064\233\127\067\337\313\311\063\127\213"
-"\353\373\166\237\031\115\305\152\037\052\105\256\053\355\057\215"
-"\247\245\000\313\004\372\045\142\056\164\110\033\312\052\214\272"
-"\333\266\176\366\273\002\174\251\303\333\130\170\241\277\360\376"
-"\032\020\125\021\316\350\151\116\226\145\306\027\003\326\007\150"
-"\214\124\202\256\034\042\125\077\361\364\011\227\050\300\106\367"
-"\116\013\045\035\367\007\327\011\035\072\030\127\070\073\350\063"
-"\006\347\217\170\106\036\133\365\006\266\354\270\246\015\361\272"
-"\023\113\326\030\040\335\151\063\112\063\025\256\270\310\230\212"
-"\047\054\223\274\055\373\356\063\277\146\346\115\272\266\233\006"
-"\125\140\227\113\274\104\315\176\364\241\330\252\057\300\002\050"
-"\041\026\142\170\333\010\124\362\374\364\064\343\306\217\034\103"
-"\127\316\220\032\113\334\056\073\050\221\211\077\172\332\065\035"
-"\216\054\356\111\354\364\063\255\311\123\250\214\237\004\123\076"
-"\044\034\122\311\022\371\142\127\243\274\356\054\353\100\174\040"
-"\043\160\053\225\371\163\027\212\321\301\034\151\246\267\070\232"
-"\147\367\160\035\172\132\014\100\317\142\017\205\074\302\002\116"
-"\176\265\366\305\052\051\204\263\037\067\052\341\252\162\102\304"
-"\355\153\032\217\222\034\135\276\321\362\133\362\253\252\251\322"
-"\365\270\244\101\053\053\221\156\022\110\312\230\330\067\215\310"
-"\355\000\060\265\266\004\116\176\234\332\204\354\300\372\173\345"
-"\035\210\244\123\106\260\224\344\134\033\241\045\054\017\110\122"
-"\167\227\011\154\354\133\030\063\203\002\345\202\176\315\205\041"
-"\060\021\375\047\117\317\344\036\354\077\245\127\154\351\052\060"
-"\031\052\210\345\303\151\070\253\157\071\161\177\204\341\101\303"
-"\341\314\052\211\040\122\056\203\017\154\071\077\113\055\026\254"
-"\055\360\044\254\000\163\364\233\263\006\077\005\270\024\205\037"
-"\253\236\134\074\236\142\235\016\155\073\200\011\374\002\352\242"
-"\227\164\312\307\371\343\126\341\303\312\245\246\232\300\220\340"
-"\044\022\123\322\302\213\332\276\355\002\103\136\147\341\211\230"
-"\171\356\313\252\312\303\033\334\347\245\106\245\174\153\026\207"
-"\266\132\050\327\333\047\074\136\245\275\266\121\335\037\103\317"
-"\073\046\310\072\215\045\141\301\111\364\074\033\311\104\352\257"
-"\034\302\053\224\001\052\016\060\321\133\213\053\107\345\303\321"
-"\004\003\233\016\071\054\326\047\324\346\160\132\331\165\317\052"
-"\330\311\000\005\344\023\210\354\303\071\373\207\141\060\066\103"
-"\003\310\236\234\242\006\302\057\305\374\360\200\143\261\124\004"
-"\240\114\251\056\306\365\166\172\330\320\344\324\224\021\345\025"
-"\265\170\006\334\270\200\217\231\251\040\063\075\020\205\114\145"
-"\011\312\076\130\136\140\223\232\252\142\135\300\121\006\034\135"
-"\140\240\015\234\113\103\366\247\026\041\244\207\252\362\301\056"
-"\356\222\060\270\236\337\337\020\001\213\206\011\160\330\154\250"
-"\267\120\036\026\226\264\367\147\375\065\072\041\220\052\062\307"
-"\000\173\115\007\020\011\271\057\163\330\030\176\147\231\004\117"
-"\006\374\120\307\205\233\235\100\235\263\226\067\372\245\334\262"
-"\162\116\357\116\011\054\375\221\375\115\367\273\246\241\076\253"
-"\173\242\003\100\246\251\125\047\342\372\371\031\316\207\165\252"
-"\361\165\066\363\363\270\221\370\221\303\213\165\023\216\114\145"
-"\232\026\071\152\345\064\350\172\226\131\177\065\260\000\375\133"
-"\151\374\103\046\372\365\050\156\376\207\331\176\044\373\264\240"
-"\202\156\124\242\377\256\277\142\264\364\162\001\302\313\230\107"
-"\230\341\114\265\027\200\200\316\217\246\050\356\036\105\152\373"
-"\337\361\035\374\132\073\326\352\364\154\035\142\111\127\073\212"
-"\217\206\352\360\123\004\316\234\026\150\377\272\271\374\210\017"
-"\107\367\002\104\162\100\270\312\073\055\123\235\334\074\126\214"
-"\131\173\150\032\054\215\161\273\154\000\307\032\316\157\100\222"
-"\261\243\057\017\331\104\362\243\160\056\236\356\016\256\062\320"
-"\073\076\213\007\352\346\171\263\134\051\342\175\153\250\136\371"
-"\132\061\350\010\226\242\214\003\230\106\361\270\175\220\124\046"
-"\355\166\142\376\236\351\232\156\136\311\111\307\134\064\123\051"
-"\124\331\354\344\106\341\200\073\165\331\337\373\171\325\207\361"
-"\272\236\353\031\316\114\122\163\346\133\207\256\045\117\071\171"
-"\314\306\270\371\020\173\354\360\233\161\244\005\240\323\051\323"
-"\116\177\037\364\055\050\170\314\125\225\173\036\221\057\314\126"
-"\030\163\213\262\333\274\151\007\346\320\330\117\355\242\377\130"
-"\205\243\155\340\112\123\267\147\175\215\014\134\133\173\167\050"
-"\002\065\104\172\004\323\050\103\310\153\060\027\135\062\270\051"
-"\065\272\166\332\073\024\112\166\030\130\244\370\222\074\236\115"
-"\063\157\106\153\010\331\061\110\150\335\364\373\044\126\064\262"
-"\317\151\146\276\110\322\212\146\042\315\362\151\315\302\123\023"
-"\105\051\101\042\326\135\230\037\266\244\262\243\302\356\002\057"
-"\121\033\334\203\244\354\160\045\250\324\010\141\062\157\344\241"
-"\201\056\174\143\162\372\051\145\274\160\104\317\135\002\003\001"
-"\000\001\060\015\006\011\052\206\110\206\367\015\001\001\005\005"
-"\000\003\202\010\001\000\125\232\064\152\042\006\151\011\105\063"
-"\307\256\251\134\307\011\116\233\206\274\101\220\324\224\122\366"
-"\315\043\051\224\113\042\315\350\275\376\235\315\122\362\275\355"
-"\253\207\311\253\253\106\004\264\275\242\077\042\060\107\120\300"
-"\113\214\166\017\003\365\222\322\261\055\304\172\065\234\311\163"
-"\207\353\246\237\336\017\163\215\323\177\231\330\272\217\157\304"
-"\363\276\032\256\213\242\224\066\220\342\345\353\215\005\364\374"
-"\145\337\225\361\304\224\115\027\126\327\237\074\217\120\074\347"
-"\167\277\225\206\046\144\373\152\377\306\332\351\214\256\102\273"
-"\151\345\063\306\330\351\015\306\125\041\111\301\014\264\243\371"
-"\233\113\134\336\203\117\101\003\316\052\171\150\070\175\360\124"
-"\111\040\365\266\020\377\010\334\063\146\226\233\377\006\336\000"
-"\236\327\316\126\103\232\121\374\160\315\366\360\121\243\267\315"
-"\264\134\205\142\315\161\267\306\053\043\053\335\303\156\100\102"
-"\372\067\377\067\034\366\172\127\224\207\205\043\327\324\311\307"
-"\137\301\115\057\311\015\327\134\354\234\045\356\236\060\202\221"
-"\226\162\270\165\035\370\011\150\127\227\262\055\113\356\045\354"
-"\172\044\051\356\162\324\234\023\333\253\334\003\012\330\112\024"
-"\311\010\127\104\135\241\265\123\200\064\362\024\227\317\122\336"
-"\242\016\212\020\351\024\357\320\140\276\141\241\361\045\135\325"
-"\030\163\077\223\020\312\226\356\263\100\322\333\243\125\317\127"
-"\132\245\016\117\165\107\337\352\367\220\232\155\365\160\056\035"
-"\024\034\067\144\004\131\120\260\334\162\206\157\234\067\075\135"
-"\050\257\163\125\357\322\356\044\164\164\023\357\334\333\061\111"
-"\373\077\143\365\323\010\076\063\245\347\235\012\336\123\054\121"
-"\216\147\333\233\101\145\101\120\275\324\244\226\154\207\274\022"
-"\340\224\307\323\300\344\313\163\130\000\203\341\254\047\205\326"
-"\235\123\235\134\275\012\076\003\103\234\014\221\365\155\173\370"
-"\100\162\165\253\021\166\221\053\341\306\252\037\160\151\166\160"
-"\025\011\376\223\320\326\055\267\025\152\233\147\134\264\151\237"
-"\045\246\175\212\373\175\042\251\161\362\316\116\214\270\041\055"
-"\336\376\101\161\015\377\235\354\163\246\273\007\117\210\016\130"
-"\107\056\176\251\302\307\170\335\272\172\236\116\340\060\116\143"
-"\157\205\324\040\101\351\372\376\103\105\347\373\257\172\262\316"
-"\244\005\035\042\232\130\206\337\344\316\114\251\376\330\026\245"
-"\157\373\330\316\126\173\365\326\040\357\344\107\315\143\044\377"
-"\271\276\361\110\243\301\001\162\346\275\300\255\355\046\015\312"
-"\064\237\374\002\055\040\117\005\040\256\041\075\014\302\040\074"
-"\077\360\004\204\334\317\211\375\271\045\221\216\320\103\346\263"
-"\040\253\134\055\325\100\236\240\113\330\364\262\314\175\361\130"
-"\012\216\207\355\210\254\066\226\344\126\240\021\212\362\232\320"
-"\263\127\243\064\273\031\253\070\341\164\153\042\304\061\316\001"
-"\325\033\066\343\036\070\114\063\223\337\100\343\131\127\116\254"
-"\156\173\036\132\075\305\035\133\254\310\020\202\065\002\042\262"
-"\374\165\350\020\221\215\304\175\170\223\107\236\034\235\254\153"
-"\142\002\130\214\326\034\043\326\257\170\302\200\234\244\252\044"
-"\124\024\265\024\230\306\370\053\032\044\313\161\062\012\342\233"
-"\016\151\153\335\176\214\144\321\056\143\357\016\177\261\076\210"
-"\114\235\125\345\311\156\027\004\267\101\377\275\212\101\313\045"
-"\061\157\104\167\077\107\261\374\201\210\007\216\005\111\040\267"
-"\021\331\151\003\052\003\235\271\063\204\232\337\337\172\343\106"
-"\163\243\330\242\214\123\031\210\125\114\164\270\366\104\204\053"
-"\321\024\055\116\071\056\222\150\377\151\374\205\142\033\353\125"
-"\117\357\045\204\142\105\231\326\330\116\157\077\123\010\175\035"
-"\006\225\201\200\177\117\116\164\066\230\265\342\207\160\230\334"
-"\327\365\334\122\025\346\306\326\171\226\071\177\217\225\317\253"
-"\200\123\255\033\013\105\100\016\324\030\275\054\336\212\167\166"
-"\375\362\104\107\306\041\320\344\164\360\330\030\005\310\174\060"
-"\162\307\337\361\273\374\002\060\251\364\102\046\131\015\223\005"
-"\202\241\163\355\064\345\070\135\315\120\220\376\224\374\023\274"
-"\275\374\250\242\210\247\163\304\262\250\321\135\210\304\002\242"
-"\172\361\004\311\376\214\164\311\357\035\144\101\237\254\036\226"
-"\147\144\254\253\050\101\307\235\367\300\230\033\156\007\302\144"
-"\175\132\203\146\126\050\066\234\347\373\034\167\016\050\240\304"
-"\367\153\171\071\004\040\204\307\127\223\274\033\240\352\274\353"
-"\102\345\250\021\376\374\254\145\314\375\370\050\210\364\245\232"
-"\345\163\121\340\250\233\015\003\167\116\345\340\230\263\210\332"
-"\175\346\306\236\174\024\146\301\056\123\112\222\007\067\240\176"
-"\351\075\011\344\025\174\317\375\270\101\245\357\236\146\235\304"
-"\136\007\035\207\370\101\255\352\347\057\322\101\143\030\067\371"
-"\024\343\115\320\345\367\103\375\025\343\371\066\163\006\046\337"
-"\001\117\251\303\116\336\040\106\167\230\264\172\044\053\073\165"
-"\053\116\130\215\233\135\244\307\026\240\274\062\210\077\241\203"
-"\363\000\310\370\330\130\351\143\135\114\053\265\360\162\101\330"
-"\253\167\067\326\162\164\256\266\066\234\310\246\203\111\113\340"
-"\311\126\013\051\276\000\060\313\335\326\310\102\212\000\331\354"
-"\025\321\064\161\362\133\144\207\366\047\322\267\353\206\260\220"
-"\277\051\333\041\236\066\214\343\040\057\225\043\121\154\033\302"
-"\244\325\346\330\002\103\147\240\376\233\120\003\104\177\273\344"
-"\162\325\321\344\332\217\222\024\144\373\135\024\020\022\112\225"
-"\006\311\145\010\051\312\041\243\046\070\021\311\047\337\160\147"
-"\004\375\312\110\062\177\143\262\105\164\061\120\117\207\331\040"
-"\160\322\041\160\261\326\020\235\063\135\170\203\221\155\125\202"
-"\354\332\344\142\143\307\201\106\327\031\145\162\052\103\031\220"
-"\270\327\043\115\114\034\340\104\251\146\147\254\356\161\171\047"
-"\046\170\155\162\016\365\135\113\043\265\174\174\145\351\027\306"
-"\072\013\015\335\136\036\121\303\206\270\354\177\307\047\112\245"
-"\106\350\152\055\031\301\207\243\313\231\223\207\144\242\125\024"
-"\114\267\103\245\223\327\347\322\116\171\100\312\145\231\106\075"
-"\077\172\200\172\210\152\314\036\345\153\063\106\364\120\300\325"
-"\037\011\270\315\212\056\241\047\353\135\163\247\350\153\012\345"
-"\127\202\052\260\374\342\124\122\126\360\253\251\022\306\043\226"
-"\007\044\234\340\274\106\245\264\040\004\332\011\223\143\345\324"
-"\056\302\176\305\061\355\265\025\164\206\027\271\263\363\046\212"
-"\035\002\152\332\032\077\350\272\361\004\155\224\121\124\342\132"
-"\264\131\203\035\140\320\055\163\314\007\265\046\214\371\327\306"
-"\210\221\357\200\317\135\017\241\140\313\105\324\102\042\321\261"
-"\160\035\375\320\267\060\220\072\306\110\155\147\345\062\332\217"
-"\333\343\250\343\035\040\045\242\034\341\114\271\244\366\306\077"
-"\134\130\015\273\306\262\167\001\026\221\237\027\006\015\267\100"
-"\076\314\217\216\234\113\340\235\176\233\036\005\253\210\042\372"
-"\323\050\033\127\024\144\112\076\044\054\070\115\041\151\000\163"
-"\056\320\125\055\164\362\025\350\224\103\076\100\052\306\306\271"
-"\152\133\336\242\314\030\120\124\135\116\052\205\154\366\222\213"
-"\051\031\176\347\352\112\340\042\053\045\274\367\146\317\167\232"
-"\101\164\362\074\024\015\164\151\365\120\203\315\315\057\041\333"
-"\042\106\212\320\367\121\032\225\127\362\005\213\032\031\355\073"
-"\105\350\066\302\156\176\373\127\042\000\037\006\123\251\256\223"
-"\306\217\161\052\061\105\222\347\216\155\346\231\042\300\203\374"
-"\357\334\127\146\167\117\242\066\061\373\241\023\215\345\312\243"
-"\225\175\001\014\144\160\073\123\102\150\200\307\273\235\250\000"
-"\065\151\230\014\250\147\330\103\345\252\317\225\340\121\225\244"
-"\027\077\102\235\270\004\316\323\171\171\310\323\212\026\062\222"
-"\340\327\242\356\327\067\114\057\254\270\173\276\105\366\361\030"
-"\063\234\173\067\246\044\331\274\100\253\000\351\303\067\213\253"
-"\330\266\363\136\201\116\260\024\153\007\076\037\354\302\366\104"
-"\042\225\273\263\346\157\326\371\160\145\272\012\203\145\252\016"
-"\023\057\203\023\043\123\213\100\026\372\316\057\374\115\004\370"
-"\353\330\254\305\066\302\025\127\110\070\354\125\263\264\036\272"
-"\255\322\102\006\027\015\163\310\127\246\276\226\115\251\362\300"
-"\373\172\041\034\365\311\160\251\202\220\265\361\014\324\171\020"
-"\276\201\246\351\134\141\234\167\171\232\244\303\067\046\127\067"
-"\311\122\054\372\010\377\320\137\306\141\300\364\166\276\374\336"
-"\116\317\253\121\231\161\307\337\176\364\326\317\006\126\031\023"
-"\123\013\155\164\131\110\031\233\123\005\055\235\062\124\323\345"
-"\054\123\213\144\076\324\144\173\343\200\011\024\314\376\026\106"
-"\143\153\161\151\370\371\313\047\366\210\124\274\105\263\316\002"
-"\310\224\356\100\133\371\102\002\302\377\260\330\054\353\050\177"
-"\136\311\046\001\231\247"
-, (PRUint32)4390 }
-};
-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 *)"Thawte Universal CA Root", (PRUint32)25 },
-  { (void *)"\213\302\212\044\257\373\126\135\350\120\025\173\172\153\157\024"
-"\170\114\220\343"
-, (PRUint32)20 },
-  { (void *)"\027\257\161\026\122\173\163\145\042\005\051\050\204\161\235\023"
-, (PRUint32)16 },
-  { (void *)"\060\127\061\017\060\015\006\003\125\004\012\023\006\124\150\141"
-"\167\164\145\061\041\060\037\006\003\125\004\013\023\030\124\150"
-"\141\167\164\145\040\125\156\151\166\145\162\163\141\154\040\103"
-"\101\040\122\157\157\164\061\041\060\037\006\003\125\004\003\023"
-"\030\124\150\141\167\164\145\040\125\156\151\166\145\162\163\141"
-"\154\040\103\101\040\122\157\157\164"
-, (PRUint32)89 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (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) }
-};
-static const NSSItem nss_builtins_items_90 [] = {
+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 *)"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"
@@ -5864,17 +3607,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_91 [] = {
+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 *)"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 },
@@ -5896,17 +3639,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)205 },
   { (void *)"\000\213\133\165\126\204\124\205\013\000\317\257\070\110\316\261"
 "\244"
 , (PRUint32)17 },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_92 [] = {
+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 *)"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"
@@ -6002,17 +3745,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_93 [] = {
+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 *)"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 },
@@ -6033,17 +3776,17 @@ static const NSSItem nss_builtins_items_
 "\165\164\150\157\162\151\164\171\040\055\040\107\063"
 , (PRUint32)205 },
   { (void *)"\141\160\313\111\214\137\230\105\051\347\260\246\331\120\133\172"
 , (PRUint32)16 },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_94 [] = {
+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 *)"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"
@@ -6140,17 +3883,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_95 [] = {
+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 *)"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 },
@@ -6172,17 +3915,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)205 },
   { (void *)"\000\233\176\006\111\243\076\142\271\325\356\220\110\161\051\357"
 "\127"
 , (PRUint32)17 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_96 [] = {
+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 *)"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"
@@ -6279,17 +4022,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_97 [] = {
+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 *)"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 },
@@ -6311,17 +4054,17 @@ static const NSSItem nss_builtins_items_
 , (PRUint32)205 },
   { (void *)"\000\354\240\247\213\156\165\152\001\317\304\174\314\057\224\136"
 "\327"
 , (PRUint32)17 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_98 [] = {
+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 *)"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"
@@ -6429,17 +4172,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_99 [] = {
+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 *)"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 },
@@ -6460,17 +4203,17 @@ static const NSSItem nss_builtins_items_
 "\150\157\162\151\164\171"
 , (PRUint32)198 },
   { (void *)"\067\112\322\103"
 , (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) }
 };
-static const NSSItem nss_builtins_items_100 [] = {
+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 *)"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"
@@ -6580,17 +4323,17 @@ static const NSSItem nss_builtins_items_
 "\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_101 [] = {
+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 *)"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 },
@@ -6611,17 +4354,17 @@ static const NSSItem nss_builtins_items_
 "\157\156\040\101\165\164\150\157\162\151\164\171"
 , (PRUint32)204 },
   { (void *)"\070\003\221\356"
 , (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) }
 };
-static const NSSItem nss_builtins_items_102 [] = {
+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 *)"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"
@@ -6719,17 +4462,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_103 [] = {
+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 *)"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 },
@@ -6749,17 +4492,17 @@ static const NSSItem nss_builtins_items_
 "\040\050\062\060\064\070\051"
 , (PRUint32)183 },
   { (void *)"\070\143\271\146"
 , (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) }
 };
-static const NSSItem nss_builtins_items_104 [] = {
+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 *)"ValiCert OCSP Responder", (PRUint32)24 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\201\262\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"
@@ -6840,17 +4583,17 @@ static const NSSItem nss_builtins_items_
 "\255\100\227\255\150\275\134\255\123\016\320\246\263\015\254\032"
 "\231\215\252\060\036\317\016\160\377\002\260\167\145\203\315\332"
 "\007\134\122\315\131\273\242\310\342\264\026\203\217\324\225\171"
 "\223\055\350\277\104\223\061\222\060\323\064\064\361\020\373\041"
 "\254\056\364\303\135\144\143\172\231\341\232\253\102\035\110\146"
 "\246\167\067\270\125\074\255\376\145\260\142\351"
 , (PRUint32)844 }
 };
-static const NSSItem nss_builtins_items_105 [] = {
+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 *)"ValiCert OCSP Responder", (PRUint32)24 },
   { (void *)"\133\166\261\274\342\212\360\366\161\221\205\147\046\215\021\151"
 "\017\027\077\163"
 , (PRUint32)20 },
@@ -6870,17 +4613,17 @@ static const NSSItem nss_builtins_items_
 "\164\056\143\157\155"
 , (PRUint32)181 },
   { (void *)"\001"
 , (PRUint32)1 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_106 [] = {
+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 *)"Baltimore CyberTrust Code Signing Root", (PRUint32)39 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\147\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"
@@ -6957,17 +4700,17 @@ static const NSSItem nss_builtins_items_
 "\310\210\371\362\315\177\276\205\264\104\147\000\120\076\364\046"
 "\003\144\352\167\175\350\136\076\034\067\107\310\326\352\244\363"
 "\066\074\227\302\071\162\005\224\031\045\303\327\067\101\017\301"
 "\037\207\212\375\252\276\351\261\144\127\344\333\222\241\317\341"
 "\111\350\073\037\221\023\132\303\217\331\045\130\111\200\107\017"
 "\306\003\256\254\343\277\267\300\252\052"
 , (PRUint32)938 }
 };
-static const NSSItem nss_builtins_items_107 [] = {
+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 *)"Baltimore CyberTrust Code Signing Root", (PRUint32)39 },
   { (void *)"\060\106\330\310\210\377\151\060\303\112\374\315\111\047\010\174"
 "\140\126\173\015"
 , (PRUint32)20 },
@@ -6982,17 +4725,17 @@ static const NSSItem nss_builtins_items_
 "\156\151\156\147\040\122\157\157\164"
 , (PRUint32)105 },
   { (void *)"\002\000\000\277"
 , (PRUint32)4 },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_108 [] = {
+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 *)"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"
@@ -7064,17 +4807,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_109 [] = {
+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 *)"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 },
@@ -7088,17 +4831,17 @@ static const NSSItem nss_builtins_items_
 "\145\162\124\162\165\163\164\040\122\157\157\164"
 , (PRUint32)92 },
   { (void *)"\002\000\000\271"
 , (PRUint32)4 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_110 [] = {
+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 *)"Baltimore CyberTrust Mobile Commerce Root", (PRUint32)42 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\141\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"
@@ -7157,17 +4900,17 @@ static const NSSItem nss_builtins_items_
 "\336\030\111\230\320\370\170\273\161\350\215\001\006\325\327\144"
 "\217\224\337\107\376\240\205\151\066\251\057\102\172\150\112\022"
 "\326\213\013\160\104\012\244\004\357\046\210\301\065\161\070\135"
 "\033\133\110\102\360\347\224\034\160\225\064\250\253\365\253\342"
 "\170\255\365\360\122\375\233\352\102\014\350\330\124\276\123\146"
 "\365"
 , (PRUint32)641 }
 };
-static const NSSItem nss_builtins_items_111 [] = {
+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 *)"Baltimore CyberTrust Mobile Commerce Root", (PRUint32)42 },
   { (void *)"\264\343\013\234\301\325\356\275\240\040\030\370\271\212\321\377"
 "\151\267\072\161"
 , (PRUint32)20 },
@@ -7182,17 +4925,17 @@ static const NSSItem nss_builtins_items_
 "\157\157\164"
 , (PRUint32)99 },
   { (void *)"\002\000\000\270"
 , (PRUint32)4 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
 };
-static const NSSItem nss_builtins_items_112 [] = {
+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 *)"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"
@@ -7250,17 +4993,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_113 [] = {
+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 *)"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 },
@@ -7274,17 +5017,17 @@ static const NSSItem nss_builtins_items_
 "\165\163\151\156\145\163\163\040\103\101\055\061"
 , (PRUint32)92 },
   { (void *)"\001"
 , (PRUint32)1 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_114 [] = {
+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 *)"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"
@@ -7341,17 +5084,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_115 [] = {
+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 *)"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 },
@@ -7365,17 +5108,17 @@ static const NSSItem nss_builtins_items_
 "\040\103\101\055\061"
 , (PRUint32)85 },
   { (void *)"\004"
 , (PRUint32)1 },
   { (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) }
 };
-static const NSSItem nss_builtins_items_116 [] = {
+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 *)"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"
@@ -7440,17 +5183,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_117 [] = {
+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 *)"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 },
@@ -7463,118 +5206,17 @@ static const NSSItem nss_builtins_items_
 "\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062"
 , (PRUint32)80 },
   { (void *)"\067\160\317\265"
 , (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) }
 };
-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 *)"Visa International Global Root 1", (PRUint32)33 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156"
-, (PRUint32)79 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156"
-, (PRUint32)79 },
-  { (void *)"\003\035"
-, (PRUint32)2 },
-  { (void *)"\060\202\003\130\060\202\002\100\240\003\002\001\002\002\002\003"
-"\035\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000"
-"\060\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\060"
-"\036\027\015\060\060\060\070\061\066\062\061\065\062\060\060\132"
-"\027\015\062\060\060\070\061\065\062\063\065\071\060\060\132\060"
-"\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061\015"
-"\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057\060"
-"\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156\164"
-"\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166\151"
-"\143\145\040\101\163\163\157\143\151\141\164\151\157\156\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\305"
-"\035\115\163\101\225\341\040\264\154\154\316\147\352\165\006\254"
-"\304\004\302\140\057\010\222\317\040\355\156\251\311\161\046\126"
-"\242\375\332\273\014\370\225\011\311\371\362\035\317\104\225\355"
-"\061\112\332\155\340\275\374\165\026\226\302\357\012\172\014\307"
-"\270\264\220\106\056\251\027\012\340\107\104\204\174\034\075\040"
-"\106\006\103\103\205\162\353\135\341\003\274\062\232\313\356\011"
-"\306\127\025\263\056\332\062\140\247\022\230\222\233\323\312\043"
-"\102\260\043\367\120\151\116\214\233\150\241\067\060\222\311\041"
-"\057\150\212\240\326\204\251\130\115\014\353\125\075\272\012\106"
-"\110\372\302\276\271\007\300\354\275\223\064\171\071\075\267\232"
-"\064\240\014\075\243\377\232\204\346\372\340\077\252\124\204\001"
-"\063\112\205\306\250\024\136\025\301\327\140\325\360\151\170\151"
-"\144\170\327\024\356\023\330\243\362\377\165\141\070\154\324\046"
-"\262\327\150\210\031\147\016\353\341\277\274\216\232\352\310\224"
-"\351\266\314\370\025\205\223\155\146\167\053\261\027\013\210\046"
-"\154\106\242\337\316\103\245\156\367\375\033\107\156\130\367\002"
-"\003\001\000\001\243\102\060\100\060\016\006\003\125\035\017\001"
-"\001\377\004\004\003\002\001\006\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\313\303\306\143\312\336\161\177\333\247\327\377"
-"\102\164\366\313\314\266\120\062\060\015\006\011\052\206\110\206"
-"\367\015\001\001\005\005\000\003\202\001\001\000\266\030\204\244"
-"\276\346\177\315\373\106\221\024\175\000\100\167\167\206\271\215"
-"\161\035\234\376\361\330\345\001\077\331\242\140\033\315\272\163"
-"\064\054\356\136\004\222\304\042\104\126\354\352\373\367\311\001"
-"\026\375\350\050\355\370\336\375\074\076\056\230\214\215\343\170"
-"\342\317\216\213\340\257\301\215\140\024\202\202\126\261\207\056"
-"\360\351\022\025\035\076\151\012\255\216\246\130\364\231\374\021"
-"\106\356\367\311\355\306\257\054\271\206\045\322\227\376\117\235"
-"\330\062\341\302\146\121\163\206\015\335\165\343\212\372\364\212"
-"\065\146\335\210\147\255\171\250\374\151\365\333\372\257\225\264"
-"\234\220\037\137\301\026\311\310\010\200\032\327\003\362\136\161"
-"\243\126\143\036\105\066\175\161\276\061\147\164\206\057\331\354"
-"\210\302\040\275\231\115\075\125\005\320\242\132\114\125\042\230"
-"\320\361\165\364\027\372\330\343\376\342\024\340\017\145\372\262"
-"\326\151\054\063\120\311\047\240\254\220\061\113\024\345\353\143"
-"\144\340\075\343\374\022\112\305\226\202\055\332\045\071\376\324"
-"\177\056\101\307\142\110\327\161\105\073\170\222"
-, (PRUint32)860 }
-};
-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 *)"Visa International Global Root 1", (PRUint32)33 },
-  { (void *)"\106\260\324\152\346\120\054\267\223\205\000\010\220\373\363\120"
-"\251\310\140\157"
-, (PRUint32)20 },
-  { (void *)"\031\152\006\154\335\311\017\266\024\321\311\373\163\077\005\317"
-, (PRUint32)16 },
-  { (void *)"\060\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156"
-, (PRUint32)79 },
-  { (void *)"\003\035"
-, (PRUint32)2 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
-};
-static const NSSItem nss_builtins_items_120 [] = {
+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 *)"Visa International Global Root 2", (PRUint32)33 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
 "\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
@@ -7649,17 +5291,17 @@ static const NSSItem nss_builtins_items_
 "\212\362\043\330\057\313\156\000\066\117\373\360\057\001\314\017"
 "\300\042\145\364\253\342\116\141\055\003\202\175\221\026\265\060"
 "\325\024\336\136\307\220\374\241\374\253\020\257\134\153\160\247"
 "\007\357\051\206\350\262\045\307\040\377\046\335\167\357\171\104"
 "\024\304\275\335\073\305\003\233\167\043\354\240\354\273\132\071"
 "\265\314\255\006"
 , (PRUint32)900 }
 };
-static const NSSItem nss_builtins_items_121 [] = {
+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 *)"Visa International Global Root 2", (PRUint32)33 },
   { (void *)"\311\015\033\352\210\075\247\321\027\276\073\171\364\041\016\032"
 "\130\224\247\055"
 , (PRUint32)20 },
@@ -7674,313 +5316,17 @@ static const NSSItem nss_builtins_items_
 "\164\040\062"
 , (PRUint32)99 },
   { (void *)"\003\036"
 , (PRUint32)2 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
 };
-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 *)"Visa International Global Root 3", (PRUint32)33 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\063"
-, (PRUint32)99 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\063"
-, (PRUint32)99 },
-  { (void *)"\003\037"
-, (PRUint32)2 },
-  { (void *)"\060\202\003\200\060\202\002\150\240\003\002\001\002\002\002\003"
-"\037\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000"
-"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\063\060\036\027\015\060\060\060\070\061\066\062\063\063"
-"\064\060\060\132\027\015\062\060\060\070\061\065\062\063\065\071"
-"\060\060\132\060\141\061\013\060\011\006\003\125\004\006\023\002"
-"\125\123\061\015\060\013\006\003\125\004\012\023\004\126\111\123"
-"\101\061\057\060\055\006\003\125\004\013\023\046\126\151\163\141"
-"\040\111\156\164\145\162\156\141\164\151\157\156\141\154\040\123"
-"\145\162\166\151\143\145\040\101\163\163\157\143\151\141\164\151"
-"\157\156\061\022\060\020\006\003\125\004\003\023\011\107\120\040"
-"\122\157\157\164\040\063\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\272\354\103\270\064\352\243\147\337"
-"\167\011\037\032\020\242\036\251\116\225\114\164\347\014\334\154"
-"\306\230\320\253\372\027\044\232\147\243\111\024\144\211\217\223"
-"\022\057\357\217\330\316\020\004\213\205\300\334\057\274\051\230"
-"\257\234\102\305\313\322\226\317\364\245\305\055\156\115\214\070"
-"\216\262\152\010\231\325\221\033\250\355\063\223\111\135\313\347"
-"\025\103\155\122\361\310\350\327\332\060\340\230\052\251\133\243"
-"\303\321\001\003\201\135\176\266\011\225\350\333\062\156\375\072"
-"\303\265\236\233\375\131\031\040\263\043\300\342\152\356\104\226"
-"\200\357\150\011\100\224\302\267\063\111\203\345\311\256\055\040"
-"\067\220\030\075\040\066\332\171\071\257\270\127\237\172\357\140"
-"\052\041\204\370\377\240\071\041\323\330\155\124\307\303\152\074"
-"\310\134\037\056\107\162\024\154\125\113\011\006\315\216\305\153"
-"\013\347\007\107\072\175\222\137\175\017\260\134\063\127\203\203"
-"\077\036\204\250\171\220\237\227\116\042\334\165\042\310\156\057"
-"\326\320\313\166\341\014\127\227\341\046\217\051\204\123\362\345"
-"\216\223\312\113\212\114\065\002\003\001\000\001\243\102\060\100"
-"\060\035\006\003\125\035\016\004\026\004\024\242\134\156\015\145"
-"\010\301\367\116\133\311\155\360\320\126\033\071\202\103\273\060"
-"\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377"
-"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003"
-"\202\001\001\000\003\215\126\010\263\241\255\375\163\102\331\147"
-"\054\156\232\317\277\036\310\115\362\115\322\331\067\311\070\104"
-"\215\256\211\014\357\214\231\053\112\223\365\155\254\146\112\077"
-"\127\152\020\245\242\032\023\246\054\352\142\347\200\371\275\375"
-"\344\377\332\021\237\071\130\155\365\103\362\364\375\246\277\235"
-"\261\253\232\106\007\337\341\360\133\077\376\135\131\100\006\254"
-"\030\010\107\114\074\114\110\106\316\210\341\250\266\236\165\246"
-"\240\367\176\033\266\304\215\355\360\052\123\025\112\333\051\117"
-"\071\123\347\122\130\243\276\334\344\220\055\265\311\316\230\377"
-"\054\206\241\010\240\310\316\367\202\071\011\014\301\302\324\251"
-"\244\052\016\063\201\307\074\160\313\060\155\244\126\267\233\134"
-"\174\002\042\276\345\007\175\155\044\321\047\261\326\035\036\134"
-"\107\074\277\056\156\370\034\204\110\354\365\341\240\225\021\315"
-"\347\060\353\134\360\051\173\165\202\002\006\262\363\223\071\322"
-"\016\254\337\137\044\023\025\060\103\365\120\324\307\203\240\103"
-"\071\117\145\064\275\246\351\316\341\164\276\040\337\322\162\026"
-"\113\211\106\166"
-, (PRUint32)900 }
-};
-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 *)"Visa International Global Root 3", (PRUint32)33 },
-  { (void *)"\000\263\327\076\235\205\161\066\073\147\325\056\136\156\371\022"
-"\242\205\067\122"
-, (PRUint32)20 },
-  { (void *)"\327\276\275\236\373\162\170\072\347\212\275\201\276\013\075\030"
-, (PRUint32)16 },
-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\063"
-, (PRUint32)99 },
-  { (void *)"\003\037"
-, (PRUint32)2 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
-};
-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 *)"Visa International Global Root 4", (PRUint32)33 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\064"
-, (PRUint32)99 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\064"
-, (PRUint32)99 },
-  { (void *)"\003\040"
-, (PRUint32)2 },
-  { (void *)"\060\202\002\173\060\202\001\344\240\003\002\001\002\002\002\003"
-"\040\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000"
-"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\064\060\036\027\015\060\060\060\070\061\067\060\060\061"
-"\071\060\060\132\027\015\062\060\060\070\061\066\062\063\065\071"
-"\060\060\132\060\141\061\013\060\011\006\003\125\004\006\023\002"
-"\125\123\061\015\060\013\006\003\125\004\012\023\004\126\111\123"
-"\101\061\057\060\055\006\003\125\004\013\023\046\126\151\163\141"
-"\040\111\156\164\145\162\156\141\164\151\157\156\141\154\040\123"
-"\145\162\166\151\143\145\040\101\163\163\157\143\151\141\164\151"
-"\157\156\061\022\060\020\006\003\125\004\003\023\011\107\120\040"
-"\122\157\157\164\040\064\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\270\353\360\217\240\346\361\343\000\077\136\162\236"
-"\256\004\017\364\117\316\312\332\142\063\352\356\132\302\301\366"
-"\056\070\211\264\015\317\241\256\271\061\263\375\246\307\266\304"
-"\154\203\014\200\141\070\072\012\276\034\001\240\031\033\347\373"
-"\162\155\222\143\233\246\257\063\364\264\133\032\350\050\336\114"
-"\347\067\361\024\361\340\027\340\024\110\354\104\035\171\245\116"
-"\252\341\244\204\167\275\313\115\266\352\160\176\137\252\027\054"
-"\113\133\260\352\205\324\151\250\021\351\053\067\035\273\246\004"
-"\356\233\101\002\003\001\000\001\243\102\060\100\060\035\006\003"
-"\125\035\016\004\026\004\024\103\306\110\100\300\017\306\030\132"
-"\111\111\345\201\200\006\115\137\335\324\205\060\017\006\003\125"
-"\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003"
-"\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011"
-"\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000\244"
-"\031\075\163\316\207\321\237\126\022\134\310\070\345\356\371\022"
-"\310\331\001\352\235\203\064\306\242\153\213\167\172\222\176\207"
-"\307\125\043\024\215\302\150\115\031\362\151\264\352\107\024\221"
-"\073\121\207\030\372\166\233\342\173\034\023\323\346\146\036\012"
-"\022\271\135\220\306\073\023\024\042\315\065\214\055\105\140\000"
-"\004\310\357\130\002\305\135\231\264\220\155\336\124\327\043\342"
-"\071\204\045\303\150\243\142\243\171\330\230\241\132\322\134\211"
-"\375\345\026\014\364\253\027\110\176\255\353\200\300\125\201"
-, (PRUint32)639 }
-};
-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 *)"Visa International Global Root 4", (PRUint32)33 },
-  { (void *)"\231\001\027\355\035\374\376\140\054\136\120\175\140\223\051\223"
-"\214\100\014\146"
-, (PRUint32)20 },
-  { (void *)"\010\107\110\253\040\057\157\302\163\013\262\025\005\041\036\312"
-, (PRUint32)16 },
-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\064"
-, (PRUint32)99 },
-  { (void *)"\003\040"
-, (PRUint32)2 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
-};
-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 *)"Visa International Global Root 5", (PRUint32)33 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\065"
-, (PRUint32)99 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\065"
-, (PRUint32)99 },
-  { (void *)"\003\041"
-, (PRUint32)2 },
-  { (void *)"\060\202\002\173\060\202\001\344\240\003\002\001\002\002\002\003"
-"\041\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000"
-"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\065\060\036\027\015\060\060\060\070\061\067\060\060\062"
-"\070\060\060\132\027\015\062\060\060\070\061\066\062\063\065\071"
-"\060\060\132\060\141\061\013\060\011\006\003\125\004\006\023\002"
-"\125\123\061\015\060\013\006\003\125\004\012\023\004\126\111\123"
-"\101\061\057\060\055\006\003\125\004\013\023\046\126\151\163\141"
-"\040\111\156\164\145\162\156\141\164\151\157\156\141\154\040\123"
-"\145\162\166\151\143\145\040\101\163\163\157\143\151\141\164\151"
-"\157\156\061\022\060\020\006\003\125\004\003\023\011\107\120\040"
-"\122\157\157\164\040\065\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\255\000\156\362\240\174\061\021\034\101\260\067\217"
-"\203\242\103\313\227\137\002\040\211\015\156\274\052\261\361\245"
-"\144\357\330\216\112\326\162\235\236\156\037\232\250\371\205\003"
-"\254\301\047\152\204\345\146\110\161\232\136\102\017\212\342\237"
-"\366\200\017\043\254\123\303\301\237\002\304\370\130\106\352\364"
-"\251\202\257\155\007\106\206\361\055\374\006\270\036\125\325\071"
-"\141\222\204\213\361\330\212\063\116\074\023\265\326\161\374\153"
-"\076\264\034\172\013\207\325\065\146\064\303\163\062\143\130\337"
-"\022\153\043\002\003\001\000\001\243\102\060\100\060\035\006\003"
-"\125\035\016\004\026\004\024\043\116\363\002\004\004\327\322\247"
-"\000\126\301\316\111\054\214\025\226\063\057\060\017\006\003\125"
-"\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003"
-"\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011"
-"\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000\074"
-"\224\001\207\362\310\317\341\217\256\271\013\342\034\175\361\031"
-"\255\321\355\366\001\133\066\123\012\200\076\256\064\126\147\160"
-"\156\103\124\116\171\315\213\325\120\031\062\330\111\070\064\375"
-"\266\163\111\353\016\111\172\277\032\367\352\007\050\045\273\025"
-"\111\034\121\112\125\232\070\057\055\017\130\371\171\321\002\145"
-"\023\214\131\237\020\177\135\027\074\164\362\265\352\167\201\066"
-"\206\157\062\133\005\264\015\243\046\147\360\344\065\016\107\275"
-"\153\301\221\235\013\364\077\232\021\174\224\026\147\266\230"
-, (PRUint32)639 }
-};
-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 *)"Visa International Global Root 5", (PRUint32)33 },
-  { (void *)"\367\027\230\102\276\276\302\037\113\055\235\013\234\067\036\064"
-"\206\325\251\317"
-, (PRUint32)20 },
-  { (void *)"\317\200\157\240\170\121\321\126\233\253\310\135\243\157\220\012"
-, (PRUint32)16 },
-  { (void *)"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\012\023\004\126\111\123\101\061\057"
-"\060\055\006\003\125\004\013\023\046\126\151\163\141\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166"
-"\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061"
-"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
-"\164\040\065"
-, (PRUint32)99 },
-  { (void *)"\003\041"
-, (PRUint32)2 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
-};
-static const NSSItem nss_builtins_items_128 [] = {
+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 *)"beTRUSTed Root CA", (PRUint32)18 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\127\127\061"
 "\022\060\020\006\003\125\004\012\023\011\142\145\124\122\125\123"
@@ -8079,17 +5425,17 @@ static const NSSItem nss_builtins_items_
 "\344\164\324\075\352\001\161\272\004\165\100\247\251\177\071\071"
 "\232\125\227\051\145\256\031\125\045\005\162\107\323\350\030\334"
 "\270\351\257\103\163\001\022\164\243\341\134\137\025\135\044\363"
 "\371\344\364\266\147\147\022\347\144\042\212\366\245\101\246\034"
 "\266\140\143\105\212\020\264\272\106\020\256\101\127\145\154\077"
 "\043\020\077\041\020\131\267\344\100\335\046\014\043\366\252\256"
 , (PRUint32)1328 }
 };
-static const NSSItem nss_builtins_items_129 [] = {
+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 *)"beTRUSTed Root CA", (PRUint32)18 },
   { (void *)"\133\315\315\314\146\366\334\344\104\037\343\175\134\303\023\114"
 "\106\364\160\070"
 , (PRUint32)20 },
@@ -8103,1476 +5449,22 @@ static const NSSItem nss_builtins_items_
 "\123\124\145\144\040\122\157\157\164\040\103\101"
 , (PRUint32)92 },
   { (void *)"\071\117\175\207"
 , (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) }
 };
-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 *)"Xcert Root CA", (PRUint32)14 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\073\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\026\060\024\006\003\125\004\013\023\015"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101"
-, (PRUint32)61 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\073\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\026\060\024\006\003\125\004\013\023\015"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101"
-, (PRUint32)61 },
-  { (void *)"\012\001\001\001\000\000\002\174\000\000\000\002\000\000\000\002"
-, (PRUint32)16 },
-  { (void *)"\060\202\003\143\060\202\002\113\240\003\002\001\002\002\020\012"
-"\001\001\001\000\000\002\174\000\000\000\002\000\000\000\002\060"
-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\073"
-"\061\041\060\037\006\003\125\004\012\023\030\130\143\145\162\164"
-"\040\111\156\164\145\162\156\141\164\151\157\156\141\154\040\111"
-"\156\143\056\061\026\060\024\006\003\125\004\013\023\015\130\143"
-"\145\162\164\040\122\157\157\164\040\103\101\060\036\027\015\060"
-"\060\060\070\061\070\061\070\061\070\061\067\132\027\015\062\065"
-"\060\070\061\065\061\071\060\063\061\067\132\060\073\061\041\060"
-"\037\006\003\125\004\012\023\030\130\143\145\162\164\040\111\156"
-"\164\145\162\156\141\164\151\157\156\141\154\040\111\156\143\056"
-"\061\026\060\024\006\003\125\004\013\023\015\130\143\145\162\164"
-"\040\122\157\157\164\040\103\101\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\250\264\141\213\035\034\076"
-"\220\173\160\062\100\155\215\026\312\065\141\141\265\342\373\025"
-"\311\364\041\136\201\033\317\042\234\254\253\273\140\320\240\063"
-"\336\021\123\032\011\017\073\032\023\251\324\207\314\130\367\055"
-"\122\251\242\302\251\072\355\317\064\235\241\002\357\270\362\270"
-"\053\127\210\020\223\265\251\065\143\273\005\102\103\042\177\277"
-"\160\136\323\050\245\125\050\040\113\223\111\217\247\277\075\100"
-"\050\015\021\257\162\046\011\005\064\011\305\253\001\223\127\241"
-"\254\146\124\230\042\234\043\353\272\014\144\234\266\075\373\342"
-"\306\226\302\317\013\117\352\310\060\372\212\053\312\034\021\226"
-"\032\051\000\214\353\162\324\121\105\251\235\167\040\325\022\273"
-"\265\362\177\006\070\202\115\175\222\036\350\325\372\310\051\107"
-"\151\032\025\021\214\257\246\054\301\050\364\151\133\151\236\344"
-"\074\023\356\300\241\140\352\101\277\302\142\113\155\242\067\204"
-"\072\076\363\260\062\256\212\153\154\023\363\072\041\012\173\226"
-"\130\063\051\136\156\250\312\151\242\276\216\006\105\135\361\146"
-"\071\125\112\034\132\044\261\113\321\002\003\001\000\001\243\143"
-"\060\141\060\017\006\003\125\035\023\001\001\377\004\005\060\003"
-"\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004\003"
-"\002\001\006\060\037\006\003\125\035\043\004\030\060\026\200\024"
-"\104\250\111\070\165\061\154\253\050\347\161\362\330\324\310\257"
-"\101\017\107\221\060\035\006\003\125\035\016\004\026\004\024\104"
-"\250\111\070\165\061\154\253\050\347\161\362\330\324\310\257\101"
-"\017\107\221\060\015\006\011\052\206\110\206\367\015\001\001\005"
-"\005\000\003\202\001\001\000\075\163\136\245\012\273\265\021\303"
-"\361\147\321\022\032\242\107\051\021\114\116\131\067\040\206\011"
-"\100\362\105\361\111\171\071\032\075\045\327\057\051\320\010\005"
-"\025\024\373\344\104\154\077\176\136\265\122\330\221\130\074\226"
-"\373\324\112\357\361\056\301\126\036\114\151\014\331\140\035\112"
-"\107\047\265\003\063\333\030\273\333\123\236\241\173\121\152\220"
-"\323\245\025\310\202\013\300\267\067\062\165\205\124\136\125\020"
-"\174\221\073\251\053\140\306\061\166\254\304\060\111\003\304\266"
-"\126\100\245\360\143\257\151\112\210\257\327\253\013\356\072\333"
-"\275\023\203\250\073\242\351\271\105\365\121\115\224\360\131\251"
-"\333\241\067\147\322\024\236\247\173\327\031\252\025\043\153\151"
-"\165\321\023\076\130\364\363\001\350\210\304\224\126\311\300\376"
-"\337\117\107\125\037\153\201\116\124\355\023\137\162\374\046\206"
-"\004\066\217\117\022\115\234\120\342\116\132\126\254\271\375\054"
-"\037\130\173\005\022\007\143\070\357\031\343\364\074\221\132\242"
-"\045\142\127\274\306\224\240\167\234\317\064\142\340\277\373\165"
-"\074\351\033\046\033\234\144"
-, (PRUint32)871 }
-};
-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 *)"Xcert Root CA", (PRUint32)14 },
-  { (void *)"\041\021\164\054\135\202\325\257\325\231\114\122\004\123\125\050"
-"\104\361\154\261"
-, (PRUint32)20 },
-  { (void *)"\226\201\231\014\155\262\211\205\303\331\200\234\063\273\076\031"
-, (PRUint32)16 },
-  { (void *)"\060\073\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\026\060\024\006\003\125\004\013\023\015"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101"
-, (PRUint32)61 },
-  { (void *)"\012\001\001\001\000\000\002\174\000\000\000\002\000\000\000\002"
-, (PRUint32)16 },
-  { (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) }
-};
-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 *)"Xcert Root CA 1024", (PRUint32)19 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\100\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\033\060\031\006\003\125\004\013\023\022"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101\040\061\060"
-"\062\064"
-, (PRUint32)66 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\100\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\033\060\031\006\003\125\004\013\023\022"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101\040\061\060"
-"\062\064"
-, (PRUint32)66 },
-  { (void *)"\012\001\001\001\000\000\002\174\000\000\000\003\000\000\000\002"
-, (PRUint32)16 },
-  { (void *)"\060\202\002\150\060\202\001\321\240\003\002\001\002\002\020\012"
-"\001\001\001\000\000\002\174\000\000\000\003\000\000\000\002\060"
-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\100"
-"\061\041\060\037\006\003\125\004\012\023\030\130\143\145\162\164"
-"\040\111\156\164\145\162\156\141\164\151\157\156\141\154\040\111"
-"\156\143\056\061\033\060\031\006\003\125\004\013\023\022\130\143"
-"\145\162\164\040\122\157\157\164\040\103\101\040\061\060\062\064"
-"\060\036\027\015\060\060\060\070\061\070\061\070\063\061\063\062"
-"\132\027\015\062\065\060\070\061\065\061\071\060\060\065\066\132"
-"\060\100\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\033\060\031\006\003\125\004\013\023\022"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101\040\061\060"
-"\062\064\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"
-"\276\067\211\021\251\242\367\107\054\052\317\152\000\046\145\050"
-"\104\244\212\344\336\240\103\125\231\104\153\274\156\270\307\316"
-"\306\143\266\323\350\157\305\230\053\044\221\270\236\242\272\161"
-"\110\336\064\040\041\172\326\322\305\211\062\245\211\306\334\205"
-"\204\124\362\236\110\355\314\104\266\006\377\216\304\316\131\255"
-"\237\154\351\042\130\301\077\024\012\103\200\207\031\122\120\343"
-"\050\007\310\254\030\342\261\032\252\243\342\140\267\166\121\007"
-"\051\071\136\110\351\146\160\201\056\070\232\275\031\175\353\002"
-"\003\001\000\001\243\143\060\141\060\017\006\003\125\035\023\001"
-"\001\377\004\005\060\003\001\001\377\060\016\006\003\125\035\017"
-"\001\001\377\004\004\003\002\001\006\060\037\006\003\125\035\043"
-"\004\030\060\026\200\024\204\171\307\117\007\131\261\153\301\072"
-"\065\272\270\364\325\231\047\310\272\016\060\035\006\003\125\035"
-"\016\004\026\004\024\204\171\307\117\007\131\261\153\301\072\065"
-"\272\270\364\325\231\047\310\272\016\060\015\006\011\052\206\110"
-"\206\367\015\001\001\005\005\000\003\201\201\000\163\260\341\000"
-"\355\256\150\322\140\003\106\353\371\034\361\245\246\174\134\062"
-"\174\354\002\141\323\034\035\163\061\054\272\216\275\111\115\310"
-"\335\331\167\165\101\347\222\041\232\154\051\333\247\154\160\206"
-"\240\134\303\344\363\062\314\001\204\131\327\210\071\070\363\250"
-"\342\342\032\260\227\315\053\027\334\144\004\017\252\152\163\224"
-"\326\353\010\306\200\151\115\336\172\325\305\067\361\222\027\074"
-"\155\323\212\041\314\144\020\252\336\142\207\037\217\270\370\252"
-"\165\112\364\010\054\365\334\146\317\303\070\176"
-, (PRUint32)620 }
-};
-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 *)"Xcert Root CA 1024", (PRUint32)19 },
-  { (void *)"\054\245\040\131\044\213\336\160\224\354\326\313\143\116\176\051"
-"\207\004\113\220"
-, (PRUint32)20 },
-  { (void *)"\304\040\322\322\017\140\113\244\062\340\221\324\040\113\111\270"
-, (PRUint32)16 },
-  { (void *)"\060\100\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\033\060\031\006\003\125\004\013\023\022"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101\040\061\060"
-"\062\064"
-, (PRUint32)66 },
-  { (void *)"\012\001\001\001\000\000\002\174\000\000\000\003\000\000\000\002"
-, (PRUint32)16 },
-  { (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) }
-};
-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 *)"Xcert Root CA v1", (PRUint32)17 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\076\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\031\060\027\006\003\125\004\013\023\020"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101\040\166\061"
-, (PRUint32)64 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\076\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\031\060\027\006\003\125\004\013\023\020"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101\040\166\061"
-, (PRUint32)64 },
-  { (void *)"\012\001\001\001\000\000\002\174\000\000\000\004\000\000\000\002"
-, (PRUint32)16 },
-  { (void *)"\060\202\002\377\060\202\001\347\002\020\012\001\001\001\000\000"
-"\002\174\000\000\000\004\000\000\000\002\060\015\006\011\052\206"
-"\110\206\367\015\001\001\005\005\000\060\076\061\041\060\037\006"
-"\003\125\004\012\023\030\130\143\145\162\164\040\111\156\164\145"
-"\162\156\141\164\151\157\156\141\154\040\111\156\143\056\061\031"
-"\060\027\006\003\125\004\013\023\020\130\143\145\162\164\040\122"
-"\157\157\164\040\103\101\040\166\061\060\036\027\015\060\060\060"
-"\070\061\070\061\070\064\060\065\060\132\027\015\062\065\060\070"
-"\061\065\061\071\060\060\063\070\132\060\076\061\041\060\037\006"
-"\003\125\004\012\023\030\130\143\145\162\164\040\111\156\164\145"
-"\162\156\141\164\151\157\156\141\154\040\111\156\143\056\061\031"
-"\060\027\006\003\125\004\013\023\020\130\143\145\162\164\040\122"
-"\157\157\164\040\103\101\040\166\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\301\222\253\362\266\065"
-"\066\002\110\017\205\364\116\057\202\145\315\110\276\261\267\075"
-"\263\173\256\272\062\064\206\074\230\277\370\260\275\373\302\314"
-"\366\011\227\070\134\215\245\043\116\341\310\204\346\220\147\164"
-"\073\243\366\156\231\053\217\303\007\322\227\121\007\117\004\313"
-"\236\262\370\074\367\070\346\226\112\072\353\025\157\347\142\346"
-"\103\063\007\262\015\132\317\225\051\071\147\210\023\043\324\214"
-"\155\137\216\041\340\061\363\265\334\231\305\304\355\205\020\176"
-"\222\324\242\035\074\037\013\263\043\346\300\313\044\233\154\020"
-"\246\315\024\326\243\235\123\217\367\036\101\232\266\033\035\010"
-"\134\367\071\101\303\036\336\114\046\243\140\174\056\023\207\221"
-"\154\327\302\043\057\347\175\031\037\315\133\352\230\305\271\106"
-"\175\065\106\344\173\213\112\331\223\340\006\253\300\314\112\375"
-"\333\332\013\060\077\270\134\340\007\023\250\305\060\374\274\206"
-"\366\252\277\016\143\057\217\111\162\020\321\236\205\371\101\355"
-"\110\074\170\014\375\240\052\006\033\257\323\335\147\057\354\110"
-"\057\121\111\066\042\267\110\315\111\357\002\003\001\000\001\060"
-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202"
-"\001\001\000\250\334\263\040\056\375\127\110\020\017\346\215\140"
-"\122\033\166\035\234\146\240\157\372\150\006\330\247\234\313\241"
-"\014\216\045\350\256\307\337\072\160\255\251\370\052\044\274\274"
-"\307\252\307\011\267\273\020\351\037\132\325\242\001\106\213\005"
-"\304\243\165\111\013\100\307\261\153\237\333\130\026\143\062\204"
-"\132\020\215\142\226\253\230\146\233\272\372\126\010\033\272\142"
-"\363\357\071\153\374\144\261\311\256\357\136\224\341\242\200\371"
-"\010\203\026\022\066\226\331\011\220\331\230\072\257\075\205\330"
-"\221\052\222\034\134\271\314\325\134\163\070\216\173\163\122\014"
-"\272\237\362\216\277\310\174\012\023\272\162\221\240\073\040\357"
-"\211\052\303\014\200\151\126\163\020\364\140\031\340\036\026\112"
-"\144\253\374\106\072\320\013\323\227\261\134\331\234\254\030\072"
-"\040\007\172\042\371\267\020\145\272\354\346\123\324\252\344\303"
-"\101\274\233\337\302\335\232\001\106\324\216\105\355\311\312\026"
-"\064\204\215\062\124\074\124\142\220\215\032\146\122\315\372\034"
-"\314\014\374\261\343\223\310\247\331\353\150\143\217\320\176\056"
-"\055\335\051"
-, (PRUint32)771 }
-};
-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 *)"Xcert Root CA v1", (PRUint32)17 },
-  { (void *)"\252\070\226\073\042\304\350\333\032\031\107\202\076\257\220\003"
-"\207\102\254\345"
-, (PRUint32)20 },
-  { (void *)"\111\216\265\061\147\112\303\226\274\213\257\160\026\303\005\111"
-, (PRUint32)16 },
-  { (void *)"\060\076\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\031\060\027\006\003\125\004\013\023\020"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101\040\166\061"
-, (PRUint32)64 },
-  { (void *)"\012\001\001\001\000\000\002\174\000\000\000\004\000\000\000\002"
-, (PRUint32)16 },
-  { (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) }
-};
-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 *)"Xcert Root CA v1 1024", (PRUint32)22 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\103\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\036\060\034\006\003\125\004\013\023\025"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101\040\166\061"
-"\040\061\060\062\064"
-, (PRUint32)69 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\103\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\036\060\034\006\003\125\004\013\023\025"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101\040\166\061"
-"\040\061\060\062\064"
-, (PRUint32)69 },
-  { (void *)"\012\001\001\001\000\000\002\174\000\000\000\005\000\000\000\002"
-, (PRUint32)16 },
-  { (void *)"\060\202\002\004\060\202\001\155\002\020\012\001\001\001\000\000"
-"\002\174\000\000\000\005\000\000\000\002\060\015\006\011\052\206"
-"\110\206\367\015\001\001\005\005\000\060\103\061\041\060\037\006"
-"\003\125\004\012\023\030\130\143\145\162\164\040\111\156\164\145"
-"\162\156\141\164\151\157\156\141\154\040\111\156\143\056\061\036"
-"\060\034\006\003\125\004\013\023\025\130\143\145\162\164\040\122"
-"\157\157\164\040\103\101\040\166\061\040\061\060\062\064\060\036"
-"\027\015\060\060\060\070\061\070\061\070\065\060\065\066\132\027"
-"\015\062\065\060\070\061\065\061\071\060\061\060\070\132\060\103"
-"\061\041\060\037\006\003\125\004\012\023\030\130\143\145\162\164"
-"\040\111\156\164\145\162\156\141\164\151\157\156\141\154\040\111"
-"\156\143\056\061\036\060\034\006\003\125\004\013\023\025\130\143"
-"\145\162\164\040\122\157\157\164\040\103\101\040\166\061\040\061"
-"\060\062\064\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"
-"\247\011\303\322\251\246\031\160\354\051\351\105\173\066\340\352"
-"\076\311\231\160\100\321\266\140\364\335\043\307\131\171\235\036"
-"\245\276\065\143\000\346\300\056\154\100\123\346\321\166\106\361"
-"\240\313\203\105\124\230\031\317\173\232\070\370\164\063\063\077"
-"\251\045\040\050\046\135\050\161\106\206\040\075\060\053\253\346"
-"\115\372\077\352\104\100\114\373\163\324\334\226\164\364\116\344"
-"\152\035\033\227\240\174\060\341\300\163\266\015\242\167\172\361"
-"\030\370\112\161\161\236\370\250\165\376\142\370\252\075\317\175"
-"\002\003\001\000\001\060\015\006\011\052\206\110\206\367\015\001"
-"\001\005\005\000\003\201\201\000\173\323\325\114\177\114\242\176"
-"\174\327\126\141\331\225\230\205\212\327\111\334\214\107\252\007"
-"\354\270\333\171\044\236\347\245\222\127\146\011\217\024\260\376"
-"\004\362\275\121\020\270\070\303\241\022\333\220\203\176\265\143"
-"\130\253\063\255\227\036\106\120\102\020\254\310\253\055\035\065"
-"\154\306\346\103\120\050\003\241\254\373\021\225\377\351\325\112"
-"\017\221\345\003\344\210\060\074\034\166\321\227\360\012\324\207"
-"\240\014\232\217\141\316\332\176\162\263\073\120\300\200\204\017"
-"\041\040\224\150\052\332\214\276"
-, (PRUint32)520 }
-};
-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 *)"Xcert Root CA v1 1024", (PRUint32)22 },
-  { (void *)"\042\072\107\064\216\347\211\332\165\206\073\031\062\260\146\340"
-"\264\121\247\064"
-, (PRUint32)20 },
-  { (void *)"\100\212\076\322\066\036\040\237\374\055\066\253\350\371\202\062"
-, (PRUint32)16 },
-  { (void *)"\060\103\061\041\060\037\006\003\125\004\012\023\030\130\143\145"
-"\162\164\040\111\156\164\145\162\156\141\164\151\157\156\141\154"
-"\040\111\156\143\056\061\036\060\034\006\003\125\004\013\023\025"
-"\130\143\145\162\164\040\122\157\157\164\040\103\101\040\166\061"
-"\040\061\060\062\064"
-, (PRUint32)69 },
-  { (void *)"\012\001\001\001\000\000\002\174\000\000\000\005\000\000\000\002"
-, (PRUint32)16 },
-  { (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) }
-};
-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 *)"Xcert EZ", (PRUint32)9 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\214\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061"
-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114"
-"\141\153\145\040\103\151\164\171\061\030\060\026\006\003\125\004"
-"\012\023\017\130\143\145\162\164\040\105\132\040\142\171\040\104"
-"\123\124\061\030\060\026\006\003\125\004\003\023\017\130\143\145"
-"\162\164\040\105\132\040\142\171\040\104\123\124\061\041\060\037"
-"\006\011\052\206\110\206\367\015\001\011\001\026\022\143\141\100"
-"\144\151\147\163\151\147\164\162\165\163\164\056\143\157\155"
-, (PRUint32)143 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\214\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061"
-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114"
-"\141\153\145\040\103\151\164\171\061\030\060\026\006\003\125\004"
-"\012\023\017\130\143\145\162\164\040\105\132\040\142\171\040\104"
-"\123\124\061\030\060\026\006\003\125\004\003\023\017\130\143\145"
-"\162\164\040\105\132\040\142\171\040\104\123\124\061\041\060\037"
-"\006\011\052\206\110\206\367\015\001\011\001\026\022\143\141\100"
-"\144\151\147\163\151\147\164\162\165\163\164\056\143\157\155"
-, (PRUint32)143 },
-  { (void *)"\000\320\036\100\220\000\000\047\113\000\000\000\001\000\000\000"
-"\004"
-, (PRUint32)17 },
-  { (void *)"\060\202\003\370\060\202\002\340\240\003\002\001\002\002\021\000"
-"\320\036\100\220\000\000\047\113\000\000\000\001\000\000\000\004"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\214\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061\027"
-"\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141"
-"\153\145\040\103\151\164\171\061\030\060\026\006\003\125\004\012"
-"\023\017\130\143\145\162\164\040\105\132\040\142\171\040\104\123"
-"\124\061\030\060\026\006\003\125\004\003\023\017\130\143\145\162"
-"\164\040\105\132\040\142\171\040\104\123\124\061\041\060\037\006"
-"\011\052\206\110\206\367\015\001\011\001\026\022\143\141\100\144"
-"\151\147\163\151\147\164\162\165\163\164\056\143\157\155\060\036"
-"\027\015\071\071\060\067\061\064\061\066\061\064\061\070\132\027"
-"\015\060\071\060\067\061\061\061\066\061\064\061\070\132\060\201"
-"\214\061\013\060\011\006\003\125\004\006\023\002\125\123\061\015"
-"\060\013\006\003\125\004\010\023\004\125\164\141\150\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\030\060\026\006\003\125\004\012\023"
-"\017\130\143\145\162\164\040\105\132\040\142\171\040\104\123\124"
-"\061\030\060\026\006\003\125\004\003\023\017\130\143\145\162\164"
-"\040\105\132\040\142\171\040\104\123\124\061\041\060\037\006\011"
-"\052\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151"
-"\147\163\151\147\164\162\165\163\164\056\143\157\155\060\202\001"
-"\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000"
-"\003\202\001\017\000\060\202\001\012\002\202\001\001\000\255\124"
-"\030\336\264\277\367\255\350\164\252\355\213\174\217\302\324\165"
-"\032\325\204\271\266\142\374\211\357\344\227\141\222\373\035\270"
-"\341\132\107\064\236\236\006\042\373\323\352\070\313\270\213\007"
-"\367\032\240\027\167\007\132\060\034\324\051\070\040\327\047\100"
-"\330\120\223\103\277\322\030\242\051\166\005\162\252\153\266\151"
-"\230\253\171\036\034\145\365\152\213\374\305\026\252\242\162\332"
-"\140\355\116\156\031\045\172\012\035\060\343\120\233\102\074\104"
-"\353\241\260\040\036\333\002\176\376\075\037\277\320\000\212\333"
-"\100\166\246\030\245\025\247\127\266\122\302\001\027\230\167\217"
-"\212\201\306\032\264\152\052\346\257\251\326\000\254\317\330\025"
-"\111\174\333\033\241\376\201\372\207\371\323\220\301\002\300\371"
-"\320\102\351\221\150\045\137\306\277\207\071\351\225\000\140\050"
-"\277\203\054\300\347\136\266\327\066\026\347\140\207\166\350\347"
-"\047\262\045\015\213\172\345\252\035\345\131\315\316\013\016\157"
-"\306\310\234\343\020\331\205\071\323\267\233\372\306\272\174\164"
-"\322\135\165\126\253\164\244\242\121\277\122\174\356\161\002\003"
-"\001\000\001\243\123\060\121\060\017\006\003\125\035\023\001\001"
-"\377\004\005\060\003\001\001\377\060\037\006\003\125\035\043\004"
-"\030\060\026\200\024\010\040\154\146\353\201\012\154\134\325\265"
-"\246\074\101\335\034\226\221\047\167\060\035\006\003\125\035\016"
-"\004\026\004\024\010\040\154\146\353\201\012\154\134\325\265\246"
-"\074\101\335\034\226\221\047\167\060\015\006\011\052\206\110\206"
-"\367\015\001\001\005\005\000\003\202\001\001\000\132\207\130\217"
-"\055\253\166\041\153\124\014\331\361\101\366\116\315\053\236\343"
-"\037\233\243\055\177\331\053\175\130\310\147\244\051\365\351\354"
-"\325\275\226\077\243\163\370\304\133\066\174\320\143\054\064\071"
-"\233\110\270\075\157\366\024\305\236\143\346\247\064\156\323\350"
-"\063\263\307\074\030\156\043\256\103\222\231\077\230\305\151\060"
-"\361\066\073\255\271\060\202\326\266\131\026\226\002\013\051\022"
-"\141\264\021\211\367\014\057\224\220\205\230\050\234\123\154\176"
-"\143\335\163\364\031\377\112\201\321\262\122\043\375\074\112\064"
-"\316\132\033\340\120\212\355\117\201\225\330\140\347\344\304\015"
-"\273\130\076\130\367\116\150\157\076\147\311\313\172\227\026\047"
-"\354\102\141\024\166\273\000\305\353\010\075\025\177\113\266\042"
-"\135\207\073\220\364\363\300\376\067\263\351\331\142\014\300\303"
-"\131\257\140\275\037\015\333\241\064\037\060\304\075\213\255\260"
-"\035\004\223\355\137\325\344\277\040\060\004\364\110\351\063\001"
-"\321\056\220\047\122\263\233\336\072\034\253\251\227\177\233\353"
-"\302\215\302\155\354\334\023\323\106\305\171\174"
-, (PRUint32)1020 }
-};
-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 *)"Xcert EZ", (PRUint32)9 },
-  { (void *)"\150\355\030\263\011\315\122\221\300\323\065\174\035\021\101\277"
-"\210\070\146\261"
-, (PRUint32)20 },
-  { (void *)"\202\022\367\211\341\013\221\140\244\266\042\237\224\150\021\222"
-, (PRUint32)16 },
-  { (void *)"\060\201\214\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\015\060\013\006\003\125\004\010\023\004\125\164\141\150\061"
-"\027\060\025\006\003\125\004\007\023\016\123\141\154\164\040\114"
-"\141\153\145\040\103\151\164\171\061\030\060\026\006\003\125\004"
-"\012\023\017\130\143\145\162\164\040\105\132\040\142\171\040\104"
-"\123\124\061\030\060\026\006\003\125\004\003\023\017\130\143\145"
-"\162\164\040\105\132\040\142\171\040\104\123\124\061\041\060\037"
-"\006\011\052\206\110\206\367\015\001\011\001\026\022\143\141\100"
-"\144\151\147\163\151\147\164\162\165\163\164\056\143\157\155"
-, (PRUint32)143 },
-  { (void *)"\000\320\036\100\220\000\000\047\113\000\000\000\001\000\000\000"
-"\004"
-, (PRUint32)17 },
-  { (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) }
-};
-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 *)"CertEngine CA", (PRUint32)14 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\103\145\162\164\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\143"
-"\145\162\164\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\143\145\162"
-"\164\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\103\145\162\164\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\143"
-"\145\162\164\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\143\145\162"
-"\164\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (void *)"\060\202\003\335\060\202\002\305\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101\061"
-"\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060\016"
-"\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061\030"
-"\060\026\006\003\125\004\012\023\017\103\145\162\164\105\156\147"
-"\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125\004"
-"\013\023\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\104\151\166\151\163"
-"\151\157\156\061\023\060\021\006\003\125\004\003\023\012\143\145"
-"\162\164\145\156\147\151\156\145\061\040\060\036\006\011\052\206"
-"\110\206\367\015\001\011\001\026\021\143\141\100\143\145\162\164"
-"\145\156\147\151\156\145\056\143\157\155\060\036\027\015\071\070"
-"\060\061\060\061\060\060\060\060\060\060\132\027\015\063\070\060"
-"\061\061\067\060\060\060\060\060\060\132\060\201\250\061\013\060"
-"\011\006\003\125\004\006\023\002\103\101\061\013\060\011\006\003"
-"\125\004\010\023\002\117\116\061\020\060\016\006\003\125\004\007"
-"\023\007\124\157\162\157\156\164\157\061\030\060\026\006\003\125"
-"\004\012\023\017\103\145\162\164\105\156\147\151\156\145\040\111"
-"\156\143\056\061\051\060\047\006\003\125\004\013\023\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\104\151\166\151\163\151\157\156\061\023"
-"\060\021\006\003\125\004\003\023\012\143\145\162\164\145\156\147"
-"\151\156\145\061\040\060\036\006\011\052\206\110\206\367\015\001"
-"\011\001\026\021\143\141\100\143\145\162\164\145\156\147\151\156"
-"\145\056\143\157\155\060\202\001\042\060\015\006\011\052\206\110"
-"\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001"
-"\012\002\202\001\001\000\355\244\327\121\024\241\151\345\155\366"
-"\357\335\077\164\066\165\130\233\336\064\302\146\361\062\163\254"
-"\237\244\150\032\141\147\260\135\153\217\340\163\222\174\216\041"
-"\031\226\345\156\231\176\167\062\134\351\030\341\107\352\140\270"
-"\204\155\155\076\105\044\037\022\044\150\321\252\213\243\004\103"
-"\220\073\033\125\265\315\237\214\317\103\252\035\042\072\363\026"
-"\131\056\233\273\021\306\347\221\225\254\160\020\150\356\107\134"
-"\104\234\051\000\132\365\234\215\232\224\227\075\061\001\254\063"
-"\036\217\123\200\030\351\034\347\156\077\115\232\340\024\361\170"
-"\002\042\113\056\114\102\160\377\015\273\065\012\225\155\326\314"
-"\323\022\112\200\255\216\105\012\313\214\043\110\271\100\130\041"
-"\114\321\077\103\177\257\376\147\306\124\101\074\307\240\240\203"
-"\235\301\371\102\174\247\167\260\345\073\002\220\330\234\060\305"
-"\030\130\032\041\225\115\103\164\031\112\273\250\015\165\221\155"
-"\376\276\166\305\172\302\220\136\201\172\243\143\325\307\333\066"
-"\141\173\342\043\143\127\135\110\331\322\225\147\262\161\102\163"
-"\216\117\233\305\350\217\002\003\001\000\001\243\020\060\016\060"
-"\014\006\003\125\035\023\004\005\060\003\001\001\377\060\015\006"
-"\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001"
-"\000\117\375\241\316\050\235\064\002\114\334\364\165\214\325\175"
-"\364\206\125\231\024\026\220\213\212\152\017\205\041\223\317\251"
-"\053\074\360\024\376\103\104\260\116\317\304\330\005\273\135\136"
-"\264\272\207\025\114\257\153\052\132\150\125\222\354\236\245\150"
-"\107\145\254\312\033\041\330\377\055\005\154\345\354\173\000\025"
-"\325\014\161\113\054\173\275\357\075\244\042\257\343\374\064\255"
-"\007\017\367\136\242\035\317\030\375\060\251\233\076\336\041\066"
-"\267\030\207\176\360\177\327\115\240\142\360\140\151\365\177\116"
-"\303\311\266\344\131\204\007\123\123\371\342\160\171\373\337\164"
-"\252\060\217\056\055\112\212\312\165\157\336\046\312\161\066\344"
-"\322\104\151\224\313\301\273\325\156\135\142\370\051\002\134\172"
-"\231\331\307\313\074\104\032\364\130\064\322\066\155\055\042\175"
-"\170\033\020\123\126\251\046\254\366\255\370\171\256\112\072\231"
-"\011\273\304\377\053\045\337\111\276\253\074\353\001\111\275\055"
-"\300\312\060\300\153\102\124\175\202\340\274\077\363\072\064\022"
-"\070\114\245\063\254\075\253\233\343\117\017\255\237\215\103\146"
-"\345"
-, (PRUint32)993 }
-};
-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 *)"CertEngine CA", (PRUint32)14 },
-  { (void *)"\301\202\340\336\254\032\145\113\262\022\013\204\012\205\326\300"
-"\267\077\264\154"
-, (PRUint32)20 },
-  { (void *)"\072\276\220\341\242\032\164\211\157\217\240\057\040\204\350\123"
-, (PRUint32)16 },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\103\145\162\164\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\143"
-"\145\162\164\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\143\145\162"
-"\164\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (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) }
-};
-static const NSSItem nss_builtins_items_142 [] = {
+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 *)"BankEngine CA", (PRUint32)14 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\102\141\156\153\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\142"
-"\141\156\153\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\142\141\156"
-"\153\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\102\141\156\153\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\142"
-"\141\156\153\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\142\141\156"
-"\153\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (void *)"\060\202\003\335\060\202\002\305\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101\061"
-"\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060\016"
-"\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061\030"
-"\060\026\006\003\125\004\012\023\017\102\141\156\153\105\156\147"
-"\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125\004"
-"\013\023\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\104\151\166\151\163"
-"\151\157\156\061\023\060\021\006\003\125\004\003\023\012\142\141"
-"\156\153\145\156\147\151\156\145\061\040\060\036\006\011\052\206"
-"\110\206\367\015\001\011\001\026\021\143\141\100\142\141\156\153"
-"\145\156\147\151\156\145\056\143\157\155\060\036\027\015\071\070"
-"\060\061\060\061\060\060\060\060\060\060\132\027\015\063\070\060"
-"\061\061\067\060\060\060\060\060\060\132\060\201\250\061\013\060"
-"\011\006\003\125\004\006\023\002\103\101\061\013\060\011\006\003"
-"\125\004\010\023\002\117\116\061\020\060\016\006\003\125\004\007"
-"\023\007\124\157\162\157\156\164\157\061\030\060\026\006\003\125"
-"\004\012\023\017\102\141\156\153\105\156\147\151\156\145\040\111"
-"\156\143\056\061\051\060\047\006\003\125\004\013\023\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\104\151\166\151\163\151\157\156\061\023"
-"\060\021\006\003\125\004\003\023\012\142\141\156\153\145\156\147"
-"\151\156\145\061\040\060\036\006\011\052\206\110\206\367\015\001"
-"\011\001\026\021\143\141\100\142\141\156\153\145\156\147\151\156"
-"\145\056\143\157\155\060\202\001\042\060\015\006\011\052\206\110"
-"\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001"
-"\012\002\202\001\001\000\327\202\350\115\100\045\327\370\104\313"
-"\342\241\326\102\307\210\027\126\333\060\367\127\202\041\063\274"
-"\161\115\122\254\142\302\007\347\251\353\353\320\023\114\214\124"
-"\077\176\236\107\067\231\327\176\352\267\120\061\034\130\303\012"
-"\047\144\336\155\124\227\251\171\364\372\350\075\354\135\262\122"
-"\313\063\151\351\063\167\366\162\327\240\372\332\062\211\210\222"
-"\020\222\243\313\062\056\327\021\165\217\332\263\032\114\246\111"
-"\217\370\016\305\313\144\331\075\025\247\063\304\311\077\072\207"
-"\072\072\315\114\334\013\336\254\276\025\033\212\330\041\276\237"
-"\171\035\366\160\202\211\365\015\137\032\354\212\223\270\251\253"
-"\125\320\174\365\274\153\304\340\145\326\307\155\356\324\364\151"
-"\067\211\253\006\060\161\357\245\037\104\247\171\206\156\007\123"
-"\271\017\174\110\021\056\043\007\265\005\100\206\203\363\027\245"
-"\134\270\360\303\127\174\003\050\264\030\006\303\212\145\367\052"
-"\222\214\311\342\330\120\176\023\324\075\014\161\154\331\030\027"
-"\062\254\312\272\217\063\160\374\112\307\151\031\350\012\343\363"
-"\355\273\167\015\234\225\002\003\001\000\001\243\020\060\016\060"
-"\014\006\003\125\035\023\004\005\060\003\001\001\377\060\015\006"
-"\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001"
-"\000\132\272\352\107\137\321\041\244\057\353\347\267\172\157\231"
-"\044\171\153\350\202\174\110\077\337\377\114\356\042\303\172\233"
-"\314\205\304\220\365\346\046\154\025\316\134\350\050\225\252\213"
-"\046\276\153\015\175\110\375\076\033\240\263\260\123\201\243\377"
-"\136\206\154\376\205\237\033\205\205\370\062\071\126\315\176\156"
-"\116\171\041\317\136\366\217\327\316\005\111\253\115\123\344\161"
-"\022\054\353\070\302\017\223\320\000\152\001\074\375\177\145\334"
-"\266\067\176\245\147\105\073\226\015\073\072\230\253\217\374\211"
-"\075\042\136\063\150\364\177\002\005\002\272\042\125\311\057\165"
-"\075\001\127\000\172\113\367\017\150\004\006\076\010\133\156\275"
-"\130\031\051\230\254\312\342\112\377\066\344\202\311\121\374\163"
-"\254\226\056\234\144\175\026\046\075\071\276\376\217\002\160\211"
-"\223\022\340\054\122\076\113\156\267\032\377\336\023\257\257\137"
-"\200\055\056\310\161\126\244\206\020\067\076\346\100\045\267\107"
-"\025\027\045\107\332\214\063\306\201\234\026\146\177\345\057\334"
-"\255\356\205\077\224\007\074\330\353\236\024\365\210\265\045\211"
-"\300"
-, (PRUint32)993 }
-};
-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 *)"BankEngine CA", (PRUint32)14 },
-  { (void *)"\174\366\047\174\203\221\226\137\011\161\303\227\066\111\273\003"
-"\233\175\076\211"
-, (PRUint32)20 },
-  { (void *)"\077\126\162\302\341\064\321\166\123\063\106\341\215\272\223\166"
-, (PRUint32)16 },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\102\141\156\153\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\142"
-"\141\156\153\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\142\141\156"
-"\153\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (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) }
-};
-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 *)"FortEngine CA", (PRUint32)14 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\106\157\162\164\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\146"
-"\157\162\164\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\146\157\162"
-"\164\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\106\157\162\164\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\146"
-"\157\162\164\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\146\157\162"
-"\164\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (void *)"\060\202\005\335\060\202\003\305\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101\061"
-"\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060\016"
-"\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061\030"
-"\060\026\006\003\125\004\012\023\017\106\157\162\164\105\156\147"
-"\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125\004"
-"\013\023\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\104\151\166\151\163"
-"\151\157\156\061\023\060\021\006\003\125\004\003\023\012\146\157"
-"\162\164\145\156\147\151\156\145\061\040\060\036\006\011\052\206"
-"\110\206\367\015\001\011\001\026\021\143\141\100\146\157\162\164"
-"\145\156\147\151\156\145\056\143\157\155\060\036\027\015\071\070"
-"\060\061\060\061\060\060\060\060\060\060\132\027\015\063\070\060"
-"\061\061\067\060\060\060\060\060\060\132\060\201\250\061\013\060"
-"\011\006\003\125\004\006\023\002\103\101\061\013\060\011\006\003"
-"\125\004\010\023\002\117\116\061\020\060\016\006\003\125\004\007"
-"\023\007\124\157\162\157\156\164\157\061\030\060\026\006\003\125"
-"\004\012\023\017\106\157\162\164\105\156\147\151\156\145\040\111"
-"\156\143\056\061\051\060\047\006\003\125\004\013\023\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\104\151\166\151\163\151\157\156\061\023"
-"\060\021\006\003\125\004\003\023\012\146\157\162\164\145\156\147"
-"\151\156\145\061\040\060\036\006\011\052\206\110\206\367\015\001"
-"\011\001\026\021\143\141\100\146\157\162\164\145\156\147\151\156"
-"\145\056\143\157\155\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\312\276\306\156\234\003\307\035\157\334"
-"\106\033\243\110\034\073\351\142\200\110\145\016\241\266\173\273"
-"\277\001\265\206\241\120\052\163\317\252\351\253\224\045\113\163"
-"\342\056\350\207\114\215\151\333\265\243\331\051\135\157\263\236"
-"\110\016\323\071\153\202\061\254\222\252\214\073\132\050\246\234"
-"\323\045\321\162\374\377\040\107\254\165\042\353\367\221\153\127"
-"\072\354\360\074\361\043\277\117\113\132\130\162\046\303\176\241"
-"\116\063\265\065\137\323\262\064\103\334\330\272\227\050\015\016"
-"\174\134\244\141\170\217\112\164\060\166\015\204\246\307\054\000"
-"\131\042\320\300\207\206\321\006\273\202\372\044\171\011\151\222"
-"\011\004\013\273\342\021\347\011\337\276\166\051\160\111\036\170"
-"\173\002\316\165\233\031\345\246\141\272\260\074\272\354\111\142"
-"\034\074\071\264\161\023\106\246\355\236\307\006\006\073\044\031"
-"\000\152\107\234\155\357\344\047\236\330\131\254\337\007\044\160"
-"\350\153\334\340\031\352\141\302\054\341\220\276\070\225\162\305"
-"\140\257\126\345\170\105\155\271\160\331\317\246\001\301\344\242"
-"\104\142\300\076\302\075\342\050\310\075\232\374\227\060\336\176"
-"\141\172\002\223\224\330\135\340\021\106\124\136\211\107\270\005"
-"\070\131\066\101\361\327\212\336\156\266\033\042\217\325\341\227"
-"\265\200\201\005\052\056\010\040\017\323\051\206\243\337\342\166"
-"\072\350\346\124\045\137\131\262\140\176\101\372\174\122\054\301"
-"\321\140\016\172\006\234\264\245\162\106\241\355\105\257\212\040"
-"\105\320\134\333\131\202\067\046\062\117\102\142\103\364\234\206"
-"\312\266\002\227\150\176\276\365\123\007\064\352\362\012\161\104"
-"\356\224\254\270\365\044\312\231\334\025\140\207\031\047\242\024"
-"\355\360\343\016\011\341\313\045\267\020\100\015\014\361\175\033"
-"\271\051\231\345\116\204\015\355\265\151\043\364\067\326\325\127"
-"\023\226\343\254\227\052\350\350\377\071\072\231\334\200\376\072"
-"\246\344\121\320\040\322\010\043\104\247\023\203\031\313\035\337"
-"\300\154\314\311\350\373\034\224\060\337\355\302\354\321\144\245"
-"\304\314\120\107\374\371\154\324\223\326\263\155\117\332\354\212"
-"\375\223\072\027\357\010\034\116\364\003\243\006\052\016\360\362"
-"\316\323\175\207\114\321\002\003\001\000\001\243\020\060\016\060"
-"\014\006\003\125\035\023\004\005\060\003\001\001\377\060\015\006"
-"\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002\001"
-"\000\127\040\151\075\147\323\331\123\262\275\132\154\224\142\261"
-"\362\035\076\011\143\374\162\051\162\200\144\155\144\236\135\000"
-"\234\334\377\375\121\020\001\335\274\257\223\201\236\005\243\075"
-"\335\250\170\127\043\344\115\067\101\151\316\345\232\140\310\326"
-"\145\064\264\220\011\234\071\013\206\143\123\250\340\361\245\074"
-"\162\066\326\223\163\333\332\005\015\062\153\321\231\213\004\236"
-"\011\051\133\004\332\312\011\203\236\143\166\117\114\144\160\073"
-"\053\377\373\034\177\121\262\152\326\144\341\071\015\220\345\257"
-"\032\172\372\166\242\306\023\060\236\123\312\052\053\010\313\321"
-"\215\145\103\352\031\325\026\000\023\035\007\360\124\125\123\145"
-"\065\116\123\265\152\110\135\100\245\061\337\032\371\352\012\160"
-"\213\101\171\205\350\302\101\316\006\230\247\076\100\327\335\311"
-"\105\014\205\037\132\054\064\106\215\074\263\304\253\254\132\221"
-"\361\054\360\156\270\371\331\173\365\104\316\172\240\152\202\216"
-"\171\057\045\313\161\212\023\203\127\263\134\247\032\000\026\062"
-"\031\242\100\350\233\112\272\314\372\353\115\113\013\025\012\057"
-"\076\132\057\163\174\071\206\140\013\210\063\054\205\244\357\023"
-"\131\346\334\373\047\343\044\076\026\124\104\361\352\123\146\264"
-"\042\040\154\251\146\106\102\352\127\063\322\146\032\302\347\226"
-"\161\070\130\130\141\141\124\156\044\265\014\316\216\063\121\260"
-"\334\150\245\157\226\355\301\165\315\004\361\211\145\003\237\022"
-"\012\112\076\340\265\324\066\216\053\233\304\101\041\175\126\240"
-"\257\300\314\264\007\034\065\124\331\125\104\151\032\056\172\116"
-"\233\116\072\352\055\255\072\252\013\355\206\276\045\270\206\134"
-"\157\166\371\256\100\335\016\225\171\124\303\074\366\116\274\134"
-"\025\251\215\236\340\071\342\126\160\377\306\253\056\334\154\026"
-"\141\353\162\163\360\347\177\265\262\233\246\054\075\022\345\111"
-"\061\034\333\270\322\036\213\041\132\131\317\161\376\322\262\363"
-"\270\132\037\115\370\262\062\067\037\053\140\062\035\004\340\120"
-"\046\354\256\370\015\270\260\320\121\274\205\031\127\041\164\125"
-"\044\207\073\127\334\070\104\126\174\147\236\272\130\340\025\143"
-"\101\324\352\130\213\360\356\121\245\112\340\302\217\021\020\000"
-"\347"
-, (PRUint32)1505 }
-};
-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 *)"FortEngine CA", (PRUint32)14 },
-  { (void *)"\101\101\246\125\070\252\007\017\342\231\174\272\223\237\274\221"
-"\355\012\034\116"
-, (PRUint32)20 },
-  { (void *)"\225\015\273\365\336\111\267\072\266\302\311\233\100\106\036\155"
-, (PRUint32)16 },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\106\157\162\164\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\146"
-"\157\162\164\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\146\157\162"
-"\164\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (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) }
-};
-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 *)"MailEngine CA", (PRUint32)14 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\115\141\151\154\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\155"
-"\141\151\154\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\155\141\151"
-"\154\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\115\141\151\154\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\155"
-"\141\151\154\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\155\141\151"
-"\154\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (void *)"\060\202\003\335\060\202\002\305\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101\061"
-"\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060\016"
-"\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061\030"
-"\060\026\006\003\125\004\012\023\017\115\141\151\154\105\156\147"
-"\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125\004"
-"\013\023\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\104\151\166\151\163"
-"\151\157\156\061\023\060\021\006\003\125\004\003\023\012\155\141"
-"\151\154\145\156\147\151\156\145\061\040\060\036\006\011\052\206"
-"\110\206\367\015\001\011\001\026\021\143\141\100\155\141\151\154"
-"\145\156\147\151\156\145\056\143\157\155\060\036\027\015\071\070"
-"\060\061\060\061\060\060\060\060\060\060\132\027\015\063\070\060"
-"\061\061\067\060\060\060\060\060\060\132\060\201\250\061\013\060"
-"\011\006\003\125\004\006\023\002\103\101\061\013\060\011\006\003"
-"\125\004\010\023\002\117\116\061\020\060\016\006\003\125\004\007"
-"\023\007\124\157\162\157\156\164\157\061\030\060\026\006\003\125"
-"\004\012\023\017\115\141\151\154\105\156\147\151\156\145\040\111"
-"\156\143\056\061\051\060\047\006\003\125\004\013\023\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\104\151\166\151\163\151\157\156\061\023"
-"\060\021\006\003\125\004\003\023\012\155\141\151\154\145\156\147"
-"\151\156\145\061\040\060\036\006\011\052\206\110\206\367\015\001"
-"\011\001\026\021\143\141\100\155\141\151\154\145\156\147\151\156"
-"\145\056\143\157\155\060\202\001\042\060\015\006\011\052\206\110"
-"\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001"
-"\012\002\202\001\001\000\251\171\237\261\117\245\307\343\105\232"
-"\176\255\067\136\321\114\354\232\165\321\352\056\172\377\336\274"
-"\304\014\214\223\365\063\176\264\137\123\033\270\346\053\271\111"
-"\046\270\371\152\264\067\235\061\132\054\137\011\270\320\366\123"
-"\134\377\160\263\360\353\364\327\373\133\104\336\375\302\065\100"
-"\322\215\250\254\311\100\342\123\052\167\114\117\041\060\303\063"
-"\315\366\120\237\102\154\032\003\141\205\154\152\313\070\341\105"
-"\001\255\050\276\076\306\331\374\126\301\177\363\061\240\145\211"
-"\036\356\171\146\124\254\377\026\311\103\025\071\315\242\207\113"
-"\004\001\006\212\357\111\101\057\152\252\226\322\263\155\015\165"
-"\236\213\134\362\366\003\210\223\216\173\015\024\025\267\214\203"
-"\025\042\177\311\125\134\232\311\305\073\271\355\250\026\370\203"
-"\274\263\151\221\126\134\107\260\076\216\062\035\042\351\216\163"
-"\225\122\027\114\273\313\276\034\100\056\130\302\104\166\230\262"
-"\273\120\026\003\053\243\102\143\173\132\374\056\014\360\333\014"
-"\320\132\146\275\031\164\370\015\142\275\233\125\302\242\075\361"
-"\334\103\266\236\307\171\002\003\001\000\001\243\020\060\016\060"
-"\014\006\003\125\035\023\004\005\060\003\001\001\377\060\015\006"
-"\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001"
-"\000\043\174\331\371\004\054\361\312\120\103\152\101\120\031\142"
-"\204\374\376\067\075\030\233\060\341\063\175\336\376\017\066\330"
-"\130\207\244\243\075\342\323\100\360\240\175\333\352\076\040\302"
-"\120\311\104\003\252\341\321\172\374\373\177\270\023\207\016\217"
-"\350\247\347\237\373\321\053\230\243\335\371\350\127\067\330\167"
-"\355\006\334\161\070\063\354\073\125\300\016\042\106\120\321\056"
-"\273\276\046\345\363\117\343\254\010\173\205\144\303\213\047\342"
-"\203\330\220\006\207\165\272\360\230\335\160\271\053\225\312\155"
-"\001\115\060\163\226\216\034\363\337\020\027\110\152\037\062\361"
-"\013\115\315\164\125\316\200\155\363\074\357\200\040\021\221\174"
-"\123\113\153\277\365\006\227\107\130\114\057\102\155\016\004\022"
-"\111\326\172\051\337\022\067\254\263\253\020\376\156\346\003\346"
-"\303\237\046\150\301\027\371\367\226\241\107\064\301\347\234\145"
-"\362\331\060\027\146\322\000\133\067\337\123\160\064\160\143\301"
-"\067\241\131\323\156\232\363\241\333\027\125\370\223\354\154\316"
-"\026\311\273\370\244\163\074\256\132\160\211\042\015\337\115\204"
-"\203"
-, (PRUint32)993 }
-};
-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 *)"MailEngine CA", (PRUint32)14 },
-  { (void *)"\052\175\170\152\226\012\241\132\305\231\364\361\115\344\004\057"
-"\271\134\173\220"
-, (PRUint32)20 },
-  { (void *)"\257\331\256\074\245\337\007\060\040\273\005\006\306\111\161\123"
-, (PRUint32)16 },
-  { (void *)"\060\201\250\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\030\060\026\006\003\125\004\012\023\017\115\141\151\154\105\156"
-"\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003\125"
-"\004\013\023\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\104\151\166\151"
-"\163\151\157\156\061\023\060\021\006\003\125\004\003\023\012\155"
-"\141\151\154\145\156\147\151\156\145\061\040\060\036\006\011\052"
-"\206\110\206\367\015\001\011\001\026\021\143\141\100\155\141\151"
-"\154\145\156\147\151\156\145\056\143\157\155"
-, (PRUint32)171 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (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) }
-};
-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 *)"TraderEngine CA", (PRUint32)16 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\256\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\032\060\030\006\003\125\004\012\023\021\124\162\141\144\145\162"
-"\105\156\147\151\156\145\040\111\156\143\056\061\051\060\047\006"
-"\003\125\004\013\023\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\104\151"
-"\166\151\163\151\157\156\061\025\060\023\006\003\125\004\003\023"
-"\014\164\162\141\144\145\162\145\156\147\151\156\145\061\042\060"
-"\040\006\011\052\206\110\206\367\015\001\011\001\026\023\143\141"
-"\100\164\162\141\144\145\162\145\156\147\151\156\145\056\143\157"
-"\155"
-, (PRUint32)177 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\256\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\032\060\030\006\003\125\004\012\023\021\124\162\141\144\145\162"
-"\105\156\147\151\156\145\040\111\156\143\056\061\051\060\047\006"
-"\003\125\004\013\023\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\104\151"
-"\166\151\163\151\157\156\061\025\060\023\006\003\125\004\003\023"
-"\014\164\162\141\144\145\162\145\156\147\151\156\145\061\042\060"
-"\040\006\011\052\206\110\206\367\015\001\011\001\026\023\143\141"
-"\100\164\162\141\144\145\162\145\156\147\151\156\145\056\143\157"
-"\155"
-, (PRUint32)177 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (void *)"\060\202\003\351\060\202\002\321\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\256\061\013\060\011\006\003\125\004\006\023\002\103\101\061"
-"\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060\016"
-"\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061\032"
-"\060\030\006\003\125\004\012\023\021\124\162\141\144\145\162\105"
-"\156\147\151\156\145\040\111\156\143\056\061\051\060\047\006\003"
-"\125\004\013\023\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\104\151\166"
-"\151\163\151\157\156\061\025\060\023\006\003\125\004\003\023\014"
-"\164\162\141\144\145\162\145\156\147\151\156\145\061\042\060\040"
-"\006\011\052\206\110\206\367\015\001\011\001\026\023\143\141\100"
-"\164\162\141\144\145\162\145\156\147\151\156\145\056\143\157\155"
-"\060\036\027\015\071\070\060\061\060\061\060\060\060\060\060\060"
-"\132\027\015\063\070\060\061\061\067\060\060\060\060\060\060\132"
-"\060\201\256\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\032\060\030\006\003\125\004\012\023\021\124\162\141\144\145\162"
-"\105\156\147\151\156\145\040\111\156\143\056\061\051\060\047\006"
-"\003\125\004\013\023\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\104\151"
-"\166\151\163\151\157\156\061\025\060\023\006\003\125\004\003\023"
-"\014\164\162\141\144\145\162\145\156\147\151\156\145\061\042\060"
-"\040\006\011\052\206\110\206\367\015\001\011\001\026\023\143\141"
-"\100\164\162\141\144\145\162\145\156\147\151\156\145\056\143\157"
-"\155\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001"
-"\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001"
-"\001\000\317\045\371\100\117\271\110\337\263\200\331\365\277\174"
-"\351\364\171\217\342\024\016\131\157\026\270\105\110\265\225\117"
-"\365\273\177\306\076\115\170\227\165\223\043\313\375\052\247\027"
-"\152\207\160\275\350\377\276\053\320\146\271\345\242\207\236\054"
-"\012\142\004\023\226\236\104\054\147\320\347\257\020\101\343\175"
-"\304\322\007\265\105\336\112\322\075\314\043\131\311\220\276\341"
-"\212\216\155\323\021\376\053\312\003\365\254\055\365\025\062\135"
-"\245\127\222\163\044\234\365\004\341\064\200\241\030\210\114\263"
-"\200\212\271\240\274\344\077\371\216\136\201\321\275\144\231\017"
-"\140\364\170\166\010\073\272\057\127\147\251\124\122\273\203\272"
-"\176\164\056\020\241\342\024\022\130\276\030\137\314\312\017\074"
-"\165\137\352\232\057\222\311\267\044\331\022\317\135\257\015\207"
-"\156\377\021\065\120\356\101\065\021\247\346\307\261\062\012\242"
-"\041\033\356\145\300\220\062\334\174\007\120\034\000\142\354\343"
-"\212\346\163\346\120\374\151\011\253\361\042\256\277\055\336\070"
-"\177\122\124\336\160\207\166\001\226\263\106\301\064\255\220\104"
-"\225\057\002\003\001\000\001\243\020\060\016\060\014\006\003\125"
-"\035\023\004\005\060\003\001\001\377\060\015\006\011\052\206\110"
-"\206\367\015\001\001\005\005\000\003\202\001\001\000\026\070\360"
-"\024\205\227\167\307\321\020\210\122\134\273\021\123\061\337\152"
-"\153\030\034\256\040\263\046\303\072\017\336\254\140\151\050\367"
-"\024\336\056\025\377\226\275\133\226\045\130\043\220\045\272\232"
-"\013\134\007\114\314\141\311\220\350\032\116\052\312\215\005\353"
-"\027\331\362\230\067\124\130\247\267\116\154\006\241\276\164\327"
-"\251\320\224\176\352\104\253\306\073\170\144\153\112\316\031\022"
-"\266\123\375\211\117\376\020\247\310\207\374\061\142\351\314\214"
-"\270\375\052\362\176\270\110\011\061\145\162\363\122\341\120\136"
-"\247\373\123\364\215\217\066\375\134\224\004\040\007\143\247\267"
-"\230\167\164\033\342\060\354\015\305\364\026\262\214\027\126\225"
-"\257\107\102\016\164\273\152\156\326\115\163\330\010\061\235\112"
-"\103\340\020\161\055\055\202\030\037\171\131\247\233\012\165\126"
-"\175\302\136\005\321\143\105\221\025\221\122\276\300\134\370\360"
-"\347\113\213\231\103\146\050\047\174\045\222\314\030\015\123\104"
-"\324\223\213\265\075\021\312\326\267\103\244\061\151\273\341\075"
-"\226\126\160\040\066\300\357\331\152\326\260\147\343"
-, (PRUint32)1005 }
-};
-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 *)"TraderEngine CA", (PRUint32)16 },
-  { (void *)"\226\137\006\006\205\177\333\000\352\163\325\301\271\274\232\264"
-"\350\273\231\263"
-, (PRUint32)20 },
-  { (void *)"\165\061\224\331\224\242\361\006\237\230\167\323\037\336\157\372"
-, (PRUint32)16 },
-  { (void *)"\060\201\256\061\013\060\011\006\003\125\004\006\023\002\103\101"
-"\061\013\060\011\006\003\125\004\010\023\002\117\116\061\020\060"
-"\016\006\003\125\004\007\023\007\124\157\162\157\156\164\157\061"
-"\032\060\030\006\003\125\004\012\023\021\124\162\141\144\145\162"
-"\105\156\147\151\156\145\040\111\156\143\056\061\051\060\047\006"
-"\003\125\004\013\023\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\104\151"
-"\166\151\163\151\157\156\061\025\060\023\006\003\125\004\003\023"
-"\014\164\162\141\144\145\162\145\156\147\151\156\145\061\042\060"
-"\040\006\011\052\206\110\206\367\015\001\011\001\026\023\143\141"
-"\100\164\162\141\144\145\162\145\156\147\151\156\145\056\143\157"
-"\155"
-, (PRUint32)177 },
-  { (void *)"\000"
-, (PRUint32)1 },
-  { (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) }
-};
-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 *)"USPS Root", (PRUint32)10 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\146\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\045\060\043\006\003\125\004\012\023\034\125\156\151\164\145\144"
-"\040\123\164\141\164\145\163\040\120\157\163\164\141\154\040\123"
-"\145\162\166\151\143\145\061\031\060\027\006\003\125\004\013\023"
-"\020\167\167\167\056\165\163\160\163\056\143\157\155\057\103\120"
-"\123\061\025\060\023\006\003\125\004\003\023\014\125\123\120\123"
-"\040\122\157\157\164\040\103\101"
-, (PRUint32)104 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\146\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\045\060\043\006\003\125\004\012\023\034\125\156\151\164\145\144"
-"\040\123\164\141\164\145\163\040\120\157\163\164\141\154\040\123"
-"\145\162\166\151\143\145\061\031\060\027\006\003\125\004\013\023"
-"\020\167\167\167\056\165\163\160\163\056\143\157\155\057\103\120"
-"\123\061\025\060\023\006\003\125\004\003\023\014\125\123\120\123"
-"\040\122\157\157\164\040\103\101"
-, (PRUint32)104 },
-  { (void *)"\047\204"
-, (PRUint32)2 },
-  { (void *)"\060\202\003\132\060\202\002\303\240\003\002\001\002\002\002\047"
-"\204\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000"
-"\060\146\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\045\060\043\006\003\125\004\012\023\034\125\156\151\164\145\144"
-"\040\123\164\141\164\145\163\040\120\157\163\164\141\154\040\123"
-"\145\162\166\151\143\145\061\031\060\027\006\003\125\004\013\023"
-"\020\167\167\167\056\165\163\160\163\056\143\157\155\057\103\120"
-"\123\061\025\060\023\006\003\125\004\003\023\014\125\123\120\123"
-"\040\122\157\157\164\040\103\101\060\036\027\015\060\061\060\064"
-"\061\063\061\066\063\070\065\060\132\027\015\062\060\060\070\061"
-"\064\061\071\060\060\060\060\132\060\146\061\013\060\011\006\003"
-"\125\004\006\023\002\125\123\061\045\060\043\006\003\125\004\012"
-"\023\034\125\156\151\164\145\144\040\123\164\141\164\145\163\040"
-"\120\157\163\164\141\154\040\123\145\162\166\151\143\145\061\031"
-"\060\027\006\003\125\004\013\023\020\167\167\167\056\165\163\160"
-"\163\056\143\157\155\057\103\120\123\061\025\060\023\006\003\125"
-"\004\003\023\014\125\123\120\123\040\122\157\157\164\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\267\251\045"
-"\254\143\332\260\222\317\224\066\260\004\377\026\156\166\004\133"
-"\365\306\074\237\306\271\102\046\125\373\223\161\205\021\145\311"
-"\141\047\210\304\136\233\376\052\170\112\122\152\105\237\250\373"
-"\221\264\343\046\135\365\103\024\046\271\336\074\155\054\146\365"
-"\123\175\336\344\126\127\262\242\171\365\341\264\332\152\367\044"
-"\345\263\050\376\236\167\226\342\016\307\005\003\314\351\121\366"
-"\226\374\021\300\226\055\163\065\377\130\163\137\362\110\065\345"
-"\104\113\320\176\325\000\036\204\155\330\045\330\321\002\003\001"
-"\000\001\243\202\001\025\060\202\001\021\060\154\006\003\125\035"
-"\040\004\145\060\143\060\013\006\011\140\206\110\001\206\371\155"
-"\146\001\060\013\006\011\140\206\110\001\206\371\155\146\002\060"
-"\013\006\011\140\206\110\001\206\371\155\146\003\060\013\006\011"
-"\140\206\110\001\206\371\155\146\004\060\013\006\011\140\206\110"
-"\001\206\371\155\146\005\060\013\006\011\140\206\110\001\206\371"
-"\155\146\006\060\013\006\011\140\206\110\001\206\371\155\146\007"
-"\060\006\006\004\125\035\040\000\060\035\006\003\125\035\016\004"
-"\026\004\024\323\316\202\164\363\057\113\211\140\162\244\136\021"
-"\277\137\165\003\242\002\253\060\037\006\003\125\035\043\004\030"
-"\060\026\200\024\323\316\202\164\363\057\113\211\140\162\244\136"
-"\021\277\137\165\003\242\002\253\060\035\006\003\125\035\022\004"
-"\026\060\024\201\022\162\157\157\164\061\060\060\060\061\100\165"
-"\163\160\163\056\143\157\155\060\041\006\003\125\035\021\004\032"
-"\060\030\201\026\143\141\141\144\155\151\156\100\145\155\141\151"
-"\154\056\165\163\160\163\056\143\157\155\060\016\006\003\125\035"
-"\017\001\001\377\004\004\003\002\001\306\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\005\005\000\003\201\201\000\065\061"
-"\212\231\336\052\270\273\344\157\330\351\320\215\337\101\136\110"
-"\047\217\146\205\026\022\263\107\023\353\001\011\176\076\370\125"
-"\065\065\205\012\117\263\350\202\247\257\255\227\135\206\116\327"
-"\267\255\254\217\240\240\124\113\245\117\364\165\007\273\057\056"
-"\031\033\036\216\355\155\113\325\115\203\310\166\227\127\206\366"
-"\044\102\005\365\262\354\026\357\274\354\275\346\220\154\217\222"
-"\263\033\031\147\046\072\257\245\307\036\362\364\165\116\151\331"
-"\273\373\017\154\134\072\310\335\255\216\012\227\035\217"
-, (PRUint32)862 }
-};
-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 *)"USPS Root", (PRUint32)10 },
-  { (void *)"\154\041\132\224\112\235\120\245\027\015\202\313\324\371\325\072"
-"\341\237\030\145"
-, (PRUint32)20 },
-  { (void *)"\274\055\035\316\370\036\035\175\021\044\152\231\160\130\175\031"
-, (PRUint32)16 },
-  { (void *)"\060\146\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\045\060\043\006\003\125\004\012\023\034\125\156\151\164\145\144"
-"\040\123\164\141\164\145\163\040\120\157\163\164\141\154\040\123"
-"\145\162\166\151\143\145\061\031\060\027\006\003\125\004\013\023"
-"\020\167\167\167\056\165\163\160\163\056\143\157\155\057\103\120"
-"\123\061\025\060\023\006\003\125\004\003\023\014\125\123\120\123"
-"\040\122\157\157\164\040\103\101"
-, (PRUint32)104 },
-  { (void *)"\047\204"
-, (PRUint32)2 },
-  { (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) }
-};
-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 *)"USPS Production 1", (PRUint32)18 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\156\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\045\060\043\006\003\125\004\012\023\034\125\156\151\164\145\144"
-"\040\123\164\141\164\145\163\040\120\157\163\164\141\154\040\123"
-"\145\162\166\151\143\145\061\031\060\027\006\003\125\004\013\023"
-"\020\167\167\167\056\165\163\160\163\056\143\157\155\057\103\120"
-"\123\061\035\060\033\006\003\125\004\003\023\024\125\123\120\123"
-"\040\120\162\157\144\165\143\164\151\157\156\040\103\101\040\061"
-, (PRUint32)112 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\146\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\045\060\043\006\003\125\004\012\023\034\125\156\151\164\145\144"
-"\040\123\164\141\164\145\163\040\120\157\163\164\141\154\040\123"
-"\145\162\166\151\143\145\061\031\060\027\006\003\125\004\013\023"
-"\020\167\167\167\056\165\163\160\163\056\143\157\155\057\103\120"
-"\123\061\025\060\023\006\003\125\004\003\023\014\125\123\120\123"
-"\040\122\157\157\164\040\103\101"
-, (PRUint32)104 },
-  { (void *)"\047\205"
-, (PRUint32)2 },
-  { (void *)"\060\202\010\157\060\202\007\330\240\003\002\001\002\002\002\047"
-"\205\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000"
-"\060\146\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\045\060\043\006\003\125\004\012\023\034\125\156\151\164\145\144"
-"\040\123\164\141\164\145\163\040\120\157\163\164\141\154\040\123"
-"\145\162\166\151\143\145\061\031\060\027\006\003\125\004\013\023"
-"\020\167\167\167\056\165\163\160\163\056\143\157\155\057\103\120"
-"\123\061\025\060\023\006\003\125\004\003\023\014\125\123\120\123"
-"\040\122\157\157\164\040\103\101\060\036\027\015\060\061\060\064"
-"\061\063\061\066\065\066\065\064\132\027\015\062\060\060\070\061"
-"\064\061\067\060\060\064\060\132\060\156\061\013\060\011\006\003"
-"\125\004\006\023\002\125\123\061\045\060\043\006\003\125\004\012"
-"\023\034\125\156\151\164\145\144\040\123\164\141\164\145\163\040"
-"\120\157\163\164\141\154\040\123\145\162\166\151\143\145\061\031"
-"\060\027\006\003\125\004\013\023\020\167\167\167\056\165\163\160"
-"\163\056\143\157\155\057\103\120\123\061\035\060\033\006\003\125"
-"\004\003\023\024\125\123\120\123\040\120\162\157\144\165\143\164"
-"\151\157\156\040\103\101\040\061\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\306\326\271\357\262\123\070\312\322\167\014"
-"\154\066\050\060\302\320\050\002\170\161\116\015\211\102\307\131"
-"\047\263\220\010\047\324\227\132\036\266\170\104\100\153\164\306"
-"\215\253\121\213\350\246\355\121\246\326\165\027\354\172\124\136"
-"\126\203\347\360\155\304\111\364\027\275\006\013\022\306\125\357"
-"\351\250\341\050\057\240\103\217\165\364\377\331\334\175\376\252"
-"\324\170\363\234\223\305\231\332\142\106\233\365\166\044\124\011"
-"\012\051\353\024\105\102\013\377\015\166\003\037\247\145\210\242"
-"\244\177\157\320\117\002\003\001\000\001\243\202\006\042\060\202"
-"\006\036\060\202\005\167\006\003\125\035\040\004\202\005\156\060"
-"\202\005\152\060\201\303\006\011\140\206\110\001\206\371\155\146"
-"\001\060\201\265\060\043\006\010\053\006\001\005\005\007\002\001"
-"\026\027\150\164\164\160\072\057\057\167\167\167\056\165\163\160"
-"\163\056\143\157\155\057\103\120\123\060\201\215\006\010\053\006"
-"\001\005\005\007\002\002\060\201\200\032\176\123\145\145\040\125"
-"\123\120\123\040\103\120\123\040\141\164\040\150\164\164\160\072"
-"\057\057\167\167\167\056\165\163\160\163\056\143\157\155\057\103"
-"\120\123\056\040\124\150\151\163\040\143\145\162\164\151\146\151"
-"\143\141\164\145\040\151\163\040\164\157\040\142\145\040\165\163"
-"\145\144\040\157\156\154\171\040\151\156\040\141\143\143\157\162"