Bug 1787505 - land NSS NSS_3_83_BETA2 UPGRADE_NSS_RELEASE, r=nss-reviewers,djackson

Differential Revision: https://phabricator.services.mozilla.com/D156982
2022-09-13 16:39:55 +00:00 · 2022-09-13 16:39:55 +00:00 · 262ca63d8f
--- a/build/moz.configure/nss.configure
+++ b/build/moz.configure/nss.configure
@ -9,7 +9,7 @@ system_lib_option("--with-system-nss", help="Use system NSS")
 imply_option("--with-system-nspr", True, when="--with-system-nss")

 nss_pkg = pkg_check_modules(
-    "NSS", "nss >= 3.82", when="--with-system-nss", config=False
+    "NSS", "nss >= 3.83", when="--with-system-nss", config=False
 )

 set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@ -1 +1 @@
-e5c1e1a0eaff
+NSS_3_83_BETA2
--- a/security/nss/cmd/lib/secpwd.c
+++ b/security/nss/cmd/lib/secpwd.c
@ -13,9 +13,6 @@

 #ifdef XP_UNIX
 #include <termios.h>
-#endif
-
-#if defined(XP_UNIX) || defined(XP_BEOS)
 #include <unistd.h> /* for isatty() */
 #endif

--- a/security/nss/cmd/modutil/install.c
+++ b/security/nss/cmd/modutil/install.c
@ -252,23 +252,10 @@ Pk11Install_Release()
 * and sends the string to the handler function if it exists.
 */

-#ifdef OSF1
-/* stdarg has already been pulled in from NSPR */
-#undef va_start
-#undef va_end
-#undef va_arg
-#include <varargs.h>
-#else
 #include <stdarg.h>
-#endif

-#ifdef OSF1
-static void
-error(long va_alist, ...)
-#else
 static void
 error(PRErrorCode errcode, ...)
-#endif
 {

    va_list ap;
@ -286,13 +273,8 @@ error(PRErrorCode errcode, ...)
    PR_Unlock(errorHandlerLock);

    if (handler) {
-#ifdef OSF1
-        va_start(ap);
-        errstr = PR_vsmprintf(errorString[va_arg(ap, Pk11Install_Error)], ap);
-#else
        va_start(ap, errcode);
        errstr = PR_vsmprintf(errorString[errcode], ap);
-#endif
        handler(errstr);
        PR_smprintf_free(errstr);
        va_end(ap);
--- a/security/nss/coreconf/BeOS.mk
+++ b/security/nss/coreconf/BeOS.mk
@ -1,47 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS)
-
-USE_PTHREADS = 
-
-ifeq ($(USE_PTHREADS),1)
-	IMPL_STRATEGY = _PTH
-endif
-
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-DEFAULT_COMPILER = gcc
-
-ifeq ($(OS_TEST),ppc)
-	OS_REL_CFLAGS	= -Dppc
-	CPU_ARCH	= ppc
-else
-	OS_REL_CFLAGS	= -Di386
-	CPU_ARCH	= x86
-endif
-
-MKSHLIB		= $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-	OPTIMIZER	= -O2
-endif
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe
-OS_LIBS			= -lbe
-
-DEFINES			+= -DBEOS
-
-ifdef USE_PTHREADS
-	DEFINES		+= -D_REENTRANT
-endif
-
-ARCH			= beos
-
-DSO_CFLAGS		= -fPIC
-DSO_LDOPTS		=
--- a/security/nss/coreconf/IRIX.mk
+++ b/security/nss/coreconf/IRIX.mk
@ -1,91 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-#
-# The default implementation strategy for Irix is classic nspr.
-#
-ifeq ($(USE_PTHREADS),1)
-	ifeq ($(USE_N32),1)
-		IMPL_STRATEGY = _n32_PTH
-	else
-		IMPL_STRATEGY = _PTH
-	endif
-endif
-
-DEFAULT_COMPILER = cc
-
-ifdef NS_USE_GCC
-	CC		= gcc
-	AS		= $(CC) -x assembler-with-cpp
-	ODD_CFLAGS	= -Wall -Wno-format -Wno-switch
-	ifdef BUILD_OPT
-		OPTIMIZER	= -O6
-	endif
-else
-	CC	= cc
-	CCC		= CC
-	ODD_CFLAGS	= -fullwarn -xansi -woff 1209
-	ifdef BUILD_OPT
-		ifeq ($(USE_N32),1)
-			OPTIMIZER	= -O -OPT:Olimit=4000
-		else
-			OPTIMIZER	= -O -Olimit 4000
-		endif
-	endif
-
-	# For 6.x machines, include this flag
-	ifeq (6., $(findstring 6., $(OS_RELEASE)))
-		ifeq ($(USE_N32),1)
-			ODD_CFLAGS	+= -n32 -mips3 -exceptions
-		else
-			ODD_CFLAGS	+= -32 -multigot
-		endif
-	else
-		ODD_CFLAGS		+= -xgot
-	endif
-	ifeq ($(USE_N32),1)
-		OS_CFLAGS	+= -dollar
-	endif
-endif
-
-ODD_CFLAGS	+= -DSVR4 -DIRIX 
-
-CPU_ARCH	= mips
-
-RANLIB		= /bin/true
-# For purify
-# NOTE: should always define _SGI_MP_SOURCE
-NOMD_OS_CFLAGS += $(ODD_CFLAGS) -D_SGI_MP_SOURCE
-
-OS_CFLAGS += $(NOMD_OS_CFLAGS)
-
-ifeq ($(USE_N32),1)
-	SHLIB_LD_OPTS	+= -n32 -mips3
-endif
-
-MKSHLIB     += $(LD) $(SHLIB_LD_OPTS) -shared -soname $(@:$(OBJDIR)/%.so=%.so)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $< $@
-
-DSO_LDOPTS	= -elf -shared -all
-
-ifdef DSO_BACKEND
-	DSO_LDOPTS += -soname $(DSO_NAME)
-endif
-
-#
-# Revision notes:
-#
-# In the IRIX compilers prior to version 7.2, -n32 implied -mips3.
-# Beginning in the 7.2 compilers, -n32 implies -mips4 when the compiler
-# is running on a system with a mips4 CPU (e.g. R8K, R10K).
-# We want our code to explicitly be mips3 code, so we now explicitly
-# set -mips3 whenever we set -n32.
-#
--- a/security/nss/coreconf/IRIX5.2.mk
+++ b/security/nss/coreconf/IRIX5.2.mk
@ -1,5 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include $(CORE_DEPTH)/coreconf/IRIX5.mk
--- a/security/nss/coreconf/IRIX5.3.mk
+++ b/security/nss/coreconf/IRIX5.3.mk
@ -1,7 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include $(CORE_DEPTH)/coreconf/IRIX5.mk
-
-OS_CFLAGS += -DIRIX5_3
--- a/security/nss/coreconf/IRIX5.mk
+++ b/security/nss/coreconf/IRIX5.mk
@ -1,10 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(CORE_DEPTH)/coreconf/IRIX.mk
-
-ifndef NS_USE_GCC
-	ODD_CFLAGS += -xgot
-endif
--- a/security/nss/coreconf/IRIX6.2.mk
+++ b/security/nss/coreconf/IRIX6.2.mk
@ -1,13 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-# catch unresolved symbols
-
-SHLIB_LD_OPTS += -no_unresolved
-
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
-
-OS_CFLAGS += -DIRIX6_2
--- a/security/nss/coreconf/IRIX6.3.mk
+++ b/security/nss/coreconf/IRIX6.3.mk
@ -1,12 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# catch unresolved symbols
-
-SHLIB_LD_OPTS += -no_unresolved
-
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
-
-OS_CFLAGS += -DIRIX6_3
--- a/security/nss/coreconf/IRIX6.5.mk
+++ b/security/nss/coreconf/IRIX6.5.mk
@ -1,15 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# catch unresolved symbols
-
-SHLIB_LD_OPTS += -no_unresolved
-
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
-
-OS_CFLAGS += -DIRIX6_5
-ifndef NS_USE_GCC
-OS_CFLAGS += -mips3
-endif
--- a/security/nss/coreconf/IRIX6.mk
+++ b/security/nss/coreconf/IRIX6.mk
@ -1,17 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(CORE_DEPTH)/coreconf/IRIX.mk
-
-ifndef NS_USE_GCC
-	ifneq ($(USE_N32),1)
-	OS_CFLAGS  += -32
-	endif
-	ODD_CFLAGS += -multigot
-endif
-
-ifeq ($(USE_PTHREADS),1)
-OS_LIBS += -lpthread
-endif
--- a/security/nss/coreconf/OSF1.mk
+++ b/security/nss/coreconf/OSF1.mk
@ -1,48 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#
-# The Bourne shell (sh) on OSF1 doesn't handle "set -e" correctly,
-# which we use to stop LOOP_OVER_DIRS submakes as soon as any
-# submake fails.  So we use the Korn shell instead.
-#
-SHELL = /usr/bin/ksh
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = cc
-
-CC         = cc
-OS_CFLAGS += $(NON_LD_FLAGS) -std1
-CCC        = cxx
-RANLIB     = /bin/true
-CPU_ARCH   = alpha
-
-ifdef BUILD_OPT
-	OPTIMIZER += -Olimit 4000
-endif
-
-NON_LD_FLAGS += -ieee_with_inexact
-OS_CFLAGS    += -DOSF1 -D_REENTRANT 
-
-ifeq ($(USE_PTHREADS),1)
-	OS_CFLAGS += -pthread
-endif
-
-# The command to build a shared library on OSF1.
-MKSHLIB    += ld -shared -expect_unresolved "*" -soname $(notdir $@)
-ifdef MAPFILE
-MKSHLIB += -hidden -input $(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
- sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,-exported_symbol ,' > $@
-
-DSO_LDOPTS += -shared
-
-# required for freebl
-USE_64=1
-# this platform name does not use a bit tag due to only having a 64-bit ABI
-64BIT_TAG=
-
--- a/security/nss/coreconf/OSF1V2.0.mk
+++ b/security/nss/coreconf/OSF1V2.0.mk
@ -1,5 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include $(CORE_DEPTH)/coreconf/OSF1.mk
--- a/security/nss/coreconf/OSF1V3.0.mk
+++ b/security/nss/coreconf/OSF1V3.0.mk
@ -1,5 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include $(CORE_DEPTH)/coreconf/OSF1.mk
--- a/security/nss/coreconf/OSF1V3.2.mk
+++ b/security/nss/coreconf/OSF1V3.2.mk
@ -1,16 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# On OSF1 V3.2, classic nspr is the default (and only) implementation
-# strategy.
-
-#
-# Config stuff for DEC OSF/1 V3.2
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk
-
-ifeq ($(OS_RELEASE),V3.2)
-	OS_CFLAGS += -DOSF1V3
-endif
--- a/security/nss/coreconf/OSF1V4.0.mk
+++ b/security/nss/coreconf/OSF1V4.0.mk
@ -1,24 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# On OSF1 V4.0, pthreads is the default implementation strategy.
-# Classic nspr is also available.
-
-ifneq ($(OS_RELEASE),V3.2)
-	USE_PTHREADS = 1
-	ifeq ($(CLASSIC_NSPR), 1)
-		USE_PTHREADS =
-		IMPL_STRATEGY := _CLASSIC
-	endif
-endif
-
-#
-# Config stuff for DEC OSF/1 V4.0
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk
-
-ifeq ($(OS_RELEASE),V4.0)
-	OS_CFLAGS += -DOSF1V4
-endif
--- a/security/nss/coreconf/OSF1V4.0B.mk
+++ b/security/nss/coreconf/OSF1V4.0B.mk
@ -1,5 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include $(CORE_DEPTH)/coreconf/OSF1V4.0.mk
--- a/security/nss/coreconf/OSF1V4.0D.mk
+++ b/security/nss/coreconf/OSF1V4.0D.mk
@ -1,9 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include $(CORE_DEPTH)/coreconf/OSF1V4.0.mk
-DEFINES	+= -DOSF1V4D
-
-OS_LIBS += -lpthread -lrt
-
--- a/security/nss/coreconf/OSF1V5.0.mk
+++ b/security/nss/coreconf/OSF1V5.0.mk
@ -1,20 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# On OSF1 V5.0, pthreads is the default implementation strategy.
-# Classic nspr is also available.
-
-ifneq ($(OS_RELEASE),V3.2)
-	USE_PTHREADS = 1
-	ifeq ($(CLASSIC_NSPR), 1)
-		USE_PTHREADS =
-		IMPL_STRATEGY := _CLASSIC
-	endif
-endif
-
-#
-# Config stuff for DEC OSF/1 V5.0
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk
--- a/security/nss/coreconf/OSF1V5.1.mk
+++ b/security/nss/coreconf/OSF1V5.1.mk
@ -1,20 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# On OSF1 V5.0, pthreads is the default implementation strategy.
-# Classic nspr is also available.
-
-ifneq ($(OS_RELEASE),V3.2)
-	USE_PTHREADS = 1
-	ifeq ($(CLASSIC_NSPR), 1)
-		USE_PTHREADS =
-		IMPL_STRATEGY := _CLASSIC
-	endif
-endif
-
-#
-# Config stuff for DEC OSF/1 V5.1
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk
--- a/security/nss/coreconf/arch.mk
+++ b/security/nss/coreconf/arch.mk
@ -33,13 +33,6 @@ else
    OS_RELEASE := $(shell uname -r)
 endif

-#
-# Force the IRIX64 machines to use IRIX.
-#
-
-ifeq ($(OS_ARCH),IRIX64)
-    OS_ARCH = IRIX
-endif

 #
 # Force the older BSD/OS versions to use the new arch name.
@ -73,20 +66,6 @@ ifeq ($(OS_ARCH),AIX)
    OS_RELEASE := $(shell uname -v).$(shell uname -r)
 endif

-#
-# Distinguish between OSF1 V4.0B and V4.0D
-#
-
-ifeq ($(OS_ARCH)$(OS_RELEASE),OSF1V4.0)
-    OS_VERSION := $(shell uname -v)
-    ifeq ($(OS_VERSION),564)
-	OS_RELEASE := V4.0B
-    endif
-    ifeq ($(OS_VERSION),878)
-	OS_RELEASE := V4.0D
-    endif
-endif
-
 #
 # SINIX changes name to ReliantUNIX with 5.43
 #
@ -103,10 +82,9 @@ endif

 #
 # Handle FreeBSD 2.2-STABLE, Linux 2.0.30-osfmach3, and
-# IRIX 6.5-ALPHA-1289139620.
 #

-ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH)))
+ifeq (,$(filter-out Linux FreeBSD ,$(OS_ARCH)))
    OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
 endif

--- a/security/nss/coreconf/config.mk
+++ b/security/nss/coreconf/config.mk
@ -30,7 +30,7 @@ endif
 #       one for each OS release.                                      #
 #######################################################################

-TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
+TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin OpenBSD \
              AIX RISCOS WINNT WIN95 Linux Android

 ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
--- a/security/nss/coreconf/coreconf.dep
+++ b/security/nss/coreconf/coreconf.dep
@ -10,3 +10,4 @@
 */

 #error "Do not include this header file."
+
--- a/security/nss/coreconf/nsinstall/nsinstall.c
+++ b/security/nss/coreconf/nsinstall/nsinstall.c
@ -26,16 +26,12 @@ typedef unsigned int mode_t;

 #define HAVE_LCHOWN

-#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(LINUX) || defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(NTO) || defined(DARWIN) || defined(BEOS) || defined(__riscos__)
+#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(LINUX) || defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(NTO) || defined(DARWIN) || defined(__riscos__)
 #undef HAVE_LCHOWN
 #endif

 #define HAVE_FCHMOD

-#if defined(BEOS)
-#undef HAVE_FCHMOD
-#endif
-
 #ifdef LINUX
 #include <getopt.h>
 #endif
--- a/security/nss/lib/certhigh/ocsp.c
+++ b/security/nss/lib/certhigh/ocsp.c
@ -146,8 +146,7 @@ cert_DupOCSPCertID(const CERTOCSPCertID *src);
 #define OCSP_TRACE_CERT(cert) dumpCertificate(cert)
 #define OCSP_TRACE_CERTID(certid) dumpCertID(certid)

-#if defined(XP_UNIX) || defined(XP_WIN32) || defined(XP_BEOS) || \
-    defined(XP_MACOSX)
+#if defined(XP_UNIX) || defined(XP_WIN32) || defined(XP_MACOSX)
 #define NSS_HAVE_GETENV 1
 #endif

--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@ -1933,170 +1933,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE

-#
-# Certificate "Camerfirma Global Chambersign Root"
-#
-# Issuer: CN=Global Chambersign Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU
-# Serial Number: 0 (0x0)
-# Subject: CN=Global Chambersign Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU
-# Not Valid Before: Tue Sep 30 16:14:18 2003
-# Not Valid After : Wed Sep 30 16:14:18 2037
-# Fingerprint (SHA-256): EF:3C:B4:17:FC:8E:BF:6F:97:87:6C:9E:4E:CE:39:DE:1E:A5:FE:64:91:41:D1:02:8B:7D:11:C0:B2:29:8C:ED
-# Fingerprint (SHA1): 33:9B:6B:14:50:24:9B:55:7A:01:87:72:84:D9:E0:2F:C3:D2:D8:E9
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Camerfirma Global Chambersign Root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\175\061\013\060\011\006\003\125\004\006\023\002\105\125\061
-\047\060\045\006\003\125\004\012\023\036\101\103\040\103\141\155
-\145\162\146\151\162\155\141\040\123\101\040\103\111\106\040\101
-\070\062\067\064\063\062\070\067\061\043\060\041\006\003\125\004
-\013\023\032\150\164\164\160\072\057\057\167\167\167\056\143\150
-\141\155\142\145\162\163\151\147\156\056\157\162\147\061\040\060
-\036\006\003\125\004\003\023\027\107\154\157\142\141\154\040\103
-\150\141\155\142\145\162\163\151\147\156\040\122\157\157\164
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\175\061\013\060\011\006\003\125\004\006\023\002\105\125\061
-\047\060\045\006\003\125\004\012\023\036\101\103\040\103\141\155
-\145\162\146\151\162\155\141\040\123\101\040\103\111\106\040\101
-\070\062\067\064\063\062\070\067\061\043\060\041\006\003\125\004
-\013\023\032\150\164\164\160\072\057\057\167\167\167\056\143\150
-\141\155\142\145\162\163\151\147\156\056\157\162\147\061\040\060
-\036\006\003\125\004\003\023\027\107\154\157\142\141\154\040\103
-\150\141\155\142\145\162\163\151\147\156\040\122\157\157\164
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\305\060\202\003\255\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\175\061\013\060\011\006\003\125\004\006\023\002\105\125\061\047
-\060\045\006\003\125\004\012\023\036\101\103\040\103\141\155\145
-\162\146\151\162\155\141\040\123\101\040\103\111\106\040\101\070
-\062\067\064\063\062\070\067\061\043\060\041\006\003\125\004\013
-\023\032\150\164\164\160\072\057\057\167\167\167\056\143\150\141
-\155\142\145\162\163\151\147\156\056\157\162\147\061\040\060\036
-\006\003\125\004\003\023\027\107\154\157\142\141\154\040\103\150
-\141\155\142\145\162\163\151\147\156\040\122\157\157\164\060\036
-\027\015\060\063\060\071\063\060\061\066\061\064\061\070\132\027
-\015\063\067\060\071\063\060\061\066\061\064\061\070\132\060\175
-\061\013\060\011\006\003\125\004\006\023\002\105\125\061\047\060
-\045\006\003\125\004\012\023\036\101\103\040\103\141\155\145\162
-\146\151\162\155\141\040\123\101\040\103\111\106\040\101\070\062
-\067\064\063\062\070\067\061\043\060\041\006\003\125\004\013\023
-\032\150\164\164\160\072\057\057\167\167\167\056\143\150\141\155
-\142\145\162\163\151\147\156\056\157\162\147\061\040\060\036\006
-\003\125\004\003\023\027\107\154\157\142\141\154\040\103\150\141
-\155\142\145\162\163\151\147\156\040\122\157\157\164\060\202\001
-\040\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000
-\003\202\001\015\000\060\202\001\010\002\202\001\001\000\242\160
-\242\320\237\102\256\133\027\307\330\175\317\024\203\374\117\311
-\241\267\023\257\212\327\236\076\004\012\222\213\140\126\372\264
-\062\057\210\115\241\140\010\364\267\011\116\240\111\057\111\326
-\323\337\235\227\132\237\224\004\160\354\077\131\331\267\314\146
-\213\230\122\050\011\002\337\305\057\204\215\172\227\167\277\354
-\100\235\045\162\253\265\077\062\230\373\267\267\374\162\204\345
-\065\207\371\125\372\243\037\016\157\056\050\335\151\240\331\102
-\020\306\370\265\104\302\320\103\177\333\274\344\242\074\152\125
-\170\012\167\251\330\352\031\062\267\057\376\134\077\033\356\261
-\230\354\312\255\172\151\105\343\226\017\125\366\346\355\165\352
-\145\350\062\126\223\106\211\250\045\212\145\006\356\153\277\171
-\007\320\361\267\257\355\054\115\222\273\300\250\137\247\147\175
-\004\362\025\010\160\254\222\326\175\004\322\063\373\114\266\013
-\013\373\032\311\304\215\003\251\176\134\362\120\253\022\245\241
-\317\110\120\245\357\322\310\032\023\372\260\177\261\202\034\167
-\152\017\137\334\013\225\217\357\103\176\346\105\011\045\002\001
-\003\243\202\001\120\060\202\001\114\060\022\006\003\125\035\023
-\001\001\377\004\010\060\006\001\001\377\002\001\014\060\077\006
-\003\125\035\037\004\070\060\066\060\064\240\062\240\060\206\056
-\150\164\164\160\072\057\057\143\162\154\056\143\150\141\155\142
-\145\162\163\151\147\156\056\157\162\147\057\143\150\141\155\142
-\145\162\163\151\147\156\162\157\157\164\056\143\162\154\060\035
-\006\003\125\035\016\004\026\004\024\103\234\066\237\260\236\060
-\115\306\316\137\255\020\253\345\003\245\372\251\024\060\016\006
-\003\125\035\017\001\001\377\004\004\003\002\001\006\060\021\006
-\011\140\206\110\001\206\370\102\001\001\004\004\003\002\000\007
-\060\052\006\003\125\035\021\004\043\060\041\201\037\143\150\141
-\155\142\145\162\163\151\147\156\162\157\157\164\100\143\150\141
-\155\142\145\162\163\151\147\156\056\157\162\147\060\052\006\003
-\125\035\022\004\043\060\041\201\037\143\150\141\155\142\145\162
-\163\151\147\156\162\157\157\164\100\143\150\141\155\142\145\162
-\163\151\147\156\056\157\162\147\060\133\006\003\125\035\040\004
-\124\060\122\060\120\006\013\053\006\001\004\001\201\207\056\012
-\001\001\060\101\060\077\006\010\053\006\001\005\005\007\002\001
-\026\063\150\164\164\160\072\057\057\143\160\163\056\143\150\141
-\155\142\145\162\163\151\147\156\056\157\162\147\057\143\160\163
-\057\143\150\141\155\142\145\162\163\151\147\156\162\157\157\164
-\056\150\164\155\154\060\015\006\011\052\206\110\206\367\015\001
-\001\005\005\000\003\202\001\001\000\074\073\160\221\371\004\124
-\047\221\341\355\355\376\150\177\141\135\345\101\145\117\062\361
-\030\005\224\152\034\336\037\160\333\076\173\062\002\064\265\014
-\154\241\212\174\245\364\217\377\324\330\255\027\325\055\004\321
-\077\130\200\342\201\131\210\276\300\343\106\223\044\376\220\275
-\046\242\060\055\350\227\046\127\065\211\164\226\030\366\025\342
-\257\044\031\126\002\002\262\272\017\024\352\306\212\146\301\206
-\105\125\213\276\222\276\234\244\004\307\111\074\236\350\051\172
-\211\327\376\257\377\150\365\245\027\220\275\254\231\314\245\206
-\127\011\147\106\333\326\026\302\106\361\344\251\120\365\217\321
-\222\025\323\137\076\306\000\111\072\156\130\262\321\321\047\015
-\045\310\062\370\040\021\315\175\062\063\110\224\124\114\335\334
-\171\304\060\237\353\216\270\125\265\327\210\134\305\152\044\075
-\262\323\005\003\121\306\007\357\314\024\162\164\075\156\162\316
-\030\050\214\112\240\167\345\011\053\105\104\107\254\267\147\177
-\001\212\005\132\223\276\241\301\377\370\347\016\147\244\107\111
-\166\135\165\220\032\365\046\217\360
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
-# For Email Distrust After: Mon Mar 01 00:00:00 2021
-CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL
-\062\061\060\063\060\061\060\060\060\060\060\060\132
-END
-
-# Trust for "Camerfirma Global Chambersign Root"
-# Issuer: CN=Global Chambersign Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU
-# Serial Number: 0 (0x0)
-# Subject: CN=Global Chambersign Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU
-# Not Valid Before: Tue Sep 30 16:14:18 2003
-# Not Valid After : Wed Sep 30 16:14:18 2037
-# Fingerprint (SHA-256): EF:3C:B4:17:FC:8E:BF:6F:97:87:6C:9E:4E:CE:39:DE:1E:A5:FE:64:91:41:D1:02:8B:7D:11:C0:B2:29:8C:ED
-# Fingerprint (SHA1): 33:9B:6B:14:50:24:9B:55:7A:01:87:72:84:D9:E0:2F:C3:D2:D8:E9
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Camerfirma Global Chambersign Root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\063\233\153\024\120\044\233\125\172\001\207\162\204\331\340\057
-\303\322\330\351
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\305\346\173\277\006\320\117\103\355\304\172\145\212\373\153\031
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\175\061\013\060\011\006\003\125\004\006\023\002\105\125\061
-\047\060\045\006\003\125\004\012\023\036\101\103\040\103\141\155
-\145\162\146\151\162\155\141\040\123\101\040\103\111\106\040\101
-\070\062\067\064\063\062\070\067\061\043\060\041\006\003\125\004
-\013\023\032\150\164\164\160\072\057\057\167\167\167\056\143\150
-\141\155\142\145\162\163\151\147\156\056\157\162\147\061\040\060
-\036\006\003\125\004\003\023\027\107\154\157\142\141\154\040\103
-\150\141\155\142\145\162\163\151\147\156\040\122\157\157\164
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "XRamp Global CA Root"
 #
@ -24479,3 +24315,584 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "DIGITALSIGN GLOBAL ROOT RSA CA"
+#
+# Issuer: CN=DIGITALSIGN GLOBAL ROOT RSA CA,O=DigitalSign Certificadora Digital,C=PT
+# Serial Number:5d:59:c8:ca:ab:09:57:f5:e6:b5:da:29:94:04:6a:ff:c5:d4:95:87
+# Subject: CN=DIGITALSIGN GLOBAL ROOT RSA CA,O=DigitalSign Certificadora Digital,C=PT
+# Not Valid Before: Thu Jan 21 10:50:34 2021
+# Not Valid After : Mon Jan 15 10:50:34 2046
+# Fingerprint (SHA-256): 82:BD:5D:85:1A:CF:7F:6E:1B:A7:BF:CB:C5:30:30:D0:E7:BC:3C:21:DF:77:2D:85:8C:AB:41:D1:99:BD:F5:95
+# Fingerprint (SHA1): B9:82:07:97:AE:52:A5:68:6F:46:07:DF:FD:03:72:3D:92:86:88:2D
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "DIGITALSIGN GLOBAL ROOT RSA CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\142\061\013\060\011\006\003\125\004\006\023\002\120\124\061
+\052\060\050\006\003\125\004\012\014\041\104\151\147\151\164\141
+\154\123\151\147\156\040\103\145\162\164\151\146\151\143\141\144
+\157\162\141\040\104\151\147\151\164\141\154\061\047\060\045\006
+\003\125\004\003\014\036\104\111\107\111\124\101\114\123\111\107
+\116\040\107\114\117\102\101\114\040\122\117\117\124\040\122\123
+\101\040\103\101
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\142\061\013\060\011\006\003\125\004\006\023\002\120\124\061
+\052\060\050\006\003\125\004\012\014\041\104\151\147\151\164\141
+\154\123\151\147\156\040\103\145\162\164\151\146\151\143\141\144
+\157\162\141\040\104\151\147\151\164\141\154\061\047\060\045\006
+\003\125\004\003\014\036\104\111\107\111\124\101\114\123\111\107
+\116\040\107\114\117\102\101\114\040\122\117\117\124\040\122\123
+\101\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\135\131\310\312\253\011\127\365\346\265\332\051\224\004
+\152\377\305\324\225\207
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\265\060\202\003\235\240\003\002\001\002\002\024\135
+\131\310\312\253\011\127\365\346\265\332\051\224\004\152\377\305
+\324\225\207\060\015\006\011\052\206\110\206\367\015\001\001\015
+\005\000\060\142\061\013\060\011\006\003\125\004\006\023\002\120
+\124\061\052\060\050\006\003\125\004\012\014\041\104\151\147\151
+\164\141\154\123\151\147\156\040\103\145\162\164\151\146\151\143
+\141\144\157\162\141\040\104\151\147\151\164\141\154\061\047\060
+\045\006\003\125\004\003\014\036\104\111\107\111\124\101\114\123
+\111\107\116\040\107\114\117\102\101\114\040\122\117\117\124\040
+\122\123\101\040\103\101\060\036\027\015\062\061\060\061\062\061
+\061\060\065\060\063\064\132\027\015\064\066\060\061\061\065\061
+\060\065\060\063\064\132\060\142\061\013\060\011\006\003\125\004
+\006\023\002\120\124\061\052\060\050\006\003\125\004\012\014\041
+\104\151\147\151\164\141\154\123\151\147\156\040\103\145\162\164
+\151\146\151\143\141\144\157\162\141\040\104\151\147\151\164\141
+\154\061\047\060\045\006\003\125\004\003\014\036\104\111\107\111
+\124\101\114\123\111\107\116\040\107\114\117\102\101\114\040\122
+\117\117\124\040\122\123\101\040\103\101\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\310\207\266\070\323
+\034\360\336\022\370\203\307\304\212\342\211\270\264\042\172\170
+\370\014\146\121\150\166\067\012\325\117\302\132\010\270\026\134
+\367\162\001\011\067\204\201\052\124\153\327\222\320\154\372\250
+\247\103\022\064\353\016\333\067\017\051\376\212\061\121\102\350
+\113\234\220\250\310\054\021\323\375\240\051\176\316\336\224\366
+\202\340\130\264\116\105\045\361\042\362\075\323\017\173\124\032
+\334\062\266\326\121\116\176\101\264\127\270\054\306\271\016\056
+\312\127\361\325\310\323\130\347\245\351\102\021\256\323\040\045
+\224\151\327\217\312\242\015\303\323\237\007\150\077\025\322\147
+\056\123\375\166\202\233\013\163\251\051\015\236\021\223\024\010
+\230\354\236\124\022\112\126\242\006\025\354\153\154\056\222\140
+\056\206\015\256\202\037\121\115\343\262\007\327\020\031\127\042
+\366\251\151\104\204\363\331\075\240\006\277\314\210\176\177\365
+\316\133\245\302\052\152\164\102\352\157\246\377\371\150\261\320
+\137\275\221\322\125\157\063\127\114\036\235\344\342\213\301\205
+\145\240\340\152\234\000\000\210\222\335\130\010\026\362\160\061
+\250\034\341\336\275\116\161\351\326\276\176\265\241\132\303\115
+\367\277\233\275\224\244\375\365\252\123\223\106\311\046\001\004
+\160\304\240\161\272\316\045\146\373\221\176\125\160\356\111\012
+\115\142\177\302\120\232\162\362\030\147\235\351\105\250\064\204
+\350\370\201\366\321\132\042\036\007\117\073\263\177\335\021\245
+\163\334\276\251\031\072\151\251\155\033\062\342\211\252\245\047
+\013\132\176\164\342\017\144\071\135\176\134\271\301\027\374\307
+\215\136\311\354\044\355\322\362\077\172\204\105\067\002\276\076
+\153\131\304\346\133\026\155\300\252\236\252\265\131\056\054\160
+\125\234\314\231\226\230\044\124\321\216\332\312\264\021\264\267
+\160\103\037\157\220\013\040\240\250\166\023\145\333\333\043\132
+\165\113\241\013\061\167\012\356\175\150\141\032\023\214\352\121
+\176\134\126\243\127\114\135\241\353\023\145\277\124\024\314\363
+\356\334\327\354\074\227\362\170\126\270\337\162\134\160\374\316
+\006\335\237\322\007\061\357\347\122\221\236\315\272\327\300\030
+\104\007\061\145\111\062\151\023\112\353\217\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\037\006\003\125\035\043\004\030\060\026
+\200\024\265\066\274\074\214\032\253\054\366\131\031\055\203\024
+\332\223\045\025\326\206\060\035\006\003\125\035\016\004\026\004
+\024\265\066\274\074\214\032\253\054\366\131\031\055\203\024\332
+\223\045\025\326\206\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\015\005\000\003\202\002\001\000\024\373\061\045\070\061\370
+\312\010\262\043\166\070\255\370\323\131\365\314\264\127\045\341
+\104\276\176\374\026\354\256\372\046\237\117\147\026\112\126\360
+\375\355\307\031\001\064\216\220\132\055\326\200\134\354\161\322
+\201\045\202\036\000\161\337\232\321\325\035\042\273\321\245\363
+\142\017\264\353\334\044\163\376\246\126\315\232\024\305\004\065
+\026\061\242\007\353\245\000\342\266\370\137\162\375\077\141\111
+\216\336\176\115\070\327\172\036\164\067\154\121\334\276\000\004
+\270\070\024\363\040\301\355\233\247\043\375\015\102\204\035\177
+\362\163\303\320\170\143\361\237\354\327\133\351\361\276\154\240
+\113\003\236\215\151\341\024\332\210\020\201\043\123\377\332\124
+\053\013\306\271\226\225\004\030\106\363\173\250\227\330\133\150
+\244\344\070\034\016\105\345\230\323\011\256\232\136\354\263\171
+\015\071\162\362\364\224\235\016\236\140\042\346\250\366\114\205
+\315\007\202\072\150\071\315\075\137\343\070\364\266\257\073\153
+\112\237\140\121\105\242\100\002\345\252\014\343\076\321\170\324
+\242\164\234\046\272\005\232\050\160\112\076\246\013\320\035\111
+\360\272\370\256\101\020\176\244\007\022\275\250\317\051\075\127
+\273\307\361\103\107\000\076\256\160\030\132\040\173\011\313\072
+\072\160\200\345\114\140\230\301\025\301\035\112\367\310\360\233
+\341\162\255\347\135\150\130\013\004\261\214\274\237\267\373\156
+\213\133\004\125\373\353\043\125\327\170\120\332\045\313\276\047
+\066\273\044\032\171\034\121\321\376\023\273\377\170\054\334\244
+\276\057\366\305\113\123\317\247\114\231\136\160\254\131\210\004
+\256\144\004\277\173\246\172\115\323\350\167\275\241\176\120\025
+\363\357\111\060\205\115\041\127\252\333\054\165\227\255\201\001
+\207\242\261\160\235\036\006\132\003\140\261\077\246\155\202\054
+\324\024\261\201\245\350\075\210\035\264\162\054\130\067\212\216
+\070\224\270\163\335\251\340\270\366\167\242\263\174\130\336\256
+\151\072\265\213\245\032\273\362\330\164\006\234\375\142\163\040
+\041\166\261\176\160\236\031\324\353\027\142\031\070\231\315\066
+\053\107\376\061\313\337\271\344\254\010\323\330\246\353\324\236
+\176\113\144\244\125\135\053\027\311
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "DIGITALSIGN GLOBAL ROOT RSA CA"
+# Issuer: CN=DIGITALSIGN GLOBAL ROOT RSA CA,O=DigitalSign Certificadora Digital,C=PT
+# Serial Number:5d:59:c8:ca:ab:09:57:f5:e6:b5:da:29:94:04:6a:ff:c5:d4:95:87
+# Subject: CN=DIGITALSIGN GLOBAL ROOT RSA CA,O=DigitalSign Certificadora Digital,C=PT
+# Not Valid Before: Thu Jan 21 10:50:34 2021
+# Not Valid After : Mon Jan 15 10:50:34 2046
+# Fingerprint (SHA-256): 82:BD:5D:85:1A:CF:7F:6E:1B:A7:BF:CB:C5:30:30:D0:E7:BC:3C:21:DF:77:2D:85:8C:AB:41:D1:99:BD:F5:95
+# Fingerprint (SHA1): B9:82:07:97:AE:52:A5:68:6F:46:07:DF:FD:03:72:3D:92:86:88:2D
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "DIGITALSIGN GLOBAL ROOT RSA CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\271\202\007\227\256\122\245\150\157\106\007\337\375\003\162\075
+\222\206\210\055
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\033\032\275\032\171\306\333\264\355\263\207\314\251\323\116\170
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\142\061\013\060\011\006\003\125\004\006\023\002\120\124\061
+\052\060\050\006\003\125\004\012\014\041\104\151\147\151\164\141
+\154\123\151\147\156\040\103\145\162\164\151\146\151\143\141\144
+\157\162\141\040\104\151\147\151\164\141\154\061\047\060\045\006
+\003\125\004\003\014\036\104\111\107\111\124\101\114\123\111\107
+\116\040\107\114\117\102\101\114\040\122\117\117\124\040\122\123
+\101\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\135\131\310\312\253\011\127\365\346\265\332\051\224\004
+\152\377\305\324\225\207
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "DIGITALSIGN GLOBAL ROOT ECDSA CA"
+#
+# Issuer: CN=DIGITALSIGN GLOBAL ROOT ECDSA CA,O=DigitalSign Certificadora Digital,C=PT
+# Serial Number:36:2d:8f:72:88:a2:28:27:e4:00:ff:24:c6:2d:e4:eb:fa:9d:b6:e1
+# Subject: CN=DIGITALSIGN GLOBAL ROOT ECDSA CA,O=DigitalSign Certificadora Digital,C=PT
+# Not Valid Before: Thu Jan 21 11:07:50 2021
+# Not Valid After : Mon Jan 15 11:07:50 2046
+# Fingerprint (SHA-256): 26:1D:71:14:AE:5F:8F:F2:D8:C7:20:9A:9D:E4:28:9E:6A:FC:9D:71:70:23:D8:54:50:90:91:99:F1:85:7C:FE
+# Fingerprint (SHA1): 67:A8:08:EB:8F:88:F5:80:6C:05:45:1B:17:F3:D7:00:2F:D2:4A:8A
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "DIGITALSIGN GLOBAL ROOT ECDSA CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\144\061\013\060\011\006\003\125\004\006\023\002\120\124\061
+\052\060\050\006\003\125\004\012\014\041\104\151\147\151\164\141
+\154\123\151\147\156\040\103\145\162\164\151\146\151\143\141\144
+\157\162\141\040\104\151\147\151\164\141\154\061\051\060\047\006
+\003\125\004\003\014\040\104\111\107\111\124\101\114\123\111\107
+\116\040\107\114\117\102\101\114\040\122\117\117\124\040\105\103
+\104\123\101\040\103\101
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\144\061\013\060\011\006\003\125\004\006\023\002\120\124\061
+\052\060\050\006\003\125\004\012\014\041\104\151\147\151\164\141
+\154\123\151\147\156\040\103\145\162\164\151\146\151\143\141\144
+\157\162\141\040\104\151\147\151\164\141\154\061\051\060\047\006
+\003\125\004\003\014\040\104\111\107\111\124\101\114\123\111\107
+\116\040\107\114\117\102\101\114\040\122\117\117\124\040\105\103
+\104\123\101\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\066\055\217\162\210\242\050\047\344\000\377\044\306\055
+\344\353\372\235\266\341
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\152\060\202\001\360\240\003\002\001\002\002\024\066
+\055\217\162\210\242\050\047\344\000\377\044\306\055\344\353\372
+\235\266\341\060\012\006\010\052\206\110\316\075\004\003\003\060
+\144\061\013\060\011\006\003\125\004\006\023\002\120\124\061\052
+\060\050\006\003\125\004\012\014\041\104\151\147\151\164\141\154
+\123\151\147\156\040\103\145\162\164\151\146\151\143\141\144\157
+\162\141\040\104\151\147\151\164\141\154\061\051\060\047\006\003
+\125\004\003\014\040\104\111\107\111\124\101\114\123\111\107\116
+\040\107\114\117\102\101\114\040\122\117\117\124\040\105\103\104
+\123\101\040\103\101\060\036\027\015\062\061\060\061\062\061\061
+\061\060\067\065\060\132\027\015\064\066\060\061\061\065\061\061
+\060\067\065\060\132\060\144\061\013\060\011\006\003\125\004\006
+\023\002\120\124\061\052\060\050\006\003\125\004\012\014\041\104
+\151\147\151\164\141\154\123\151\147\156\040\103\145\162\164\151
+\146\151\143\141\144\157\162\141\040\104\151\147\151\164\141\154
+\061\051\060\047\006\003\125\004\003\014\040\104\111\107\111\124
+\101\114\123\111\107\116\040\107\114\117\102\101\114\040\122\117
+\117\124\040\105\103\104\123\101\040\103\101\060\166\060\020\006
+\007\052\206\110\316\075\002\001\006\005\053\201\004\000\042\003
+\142\000\004\156\013\243\253\063\115\034\352\112\350\374\004\215
+\024\240\175\360\010\054\137\203\253\223\321\322\173\272\327\111
+\175\217\354\022\120\137\324\271\313\345\360\371\063\143\037\311
+\127\354\100\330\021\013\227\350\122\026\314\051\216\364\006\206
+\036\070\334\075\127\304\356\252\275\310\124\004\046\132\047\023
+\121\107\075\037\037\032\216\250\225\244\063\320\314\107\314\155
+\270\374\110\243\143\060\141\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\316\257\112\213\032\165\342\361\070\347\002
+\360\026\255\136\352\144\325\173\264\060\035\006\003\125\035\016
+\004\026\004\024\316\257\112\213\032\165\342\361\070\347\002\360
+\026\255\136\352\144\325\173\264\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\001\006\060\012\006\010\052\206\110\316
+\075\004\003\003\003\150\000\060\145\002\060\012\210\304\161\234
+\104\003\115\215\264\307\274\250\256\331\060\047\065\152\153\026
+\143\327\374\347\131\341\247\211\033\114\061\232\043\125\104\346
+\363\103\041\325\107\047\157\155\127\001\252\002\061\000\373\262
+\352\342\227\177\121\265\237\110\353\274\157\065\211\250\144\160
+\253\127\166\315\300\306\024\140\312\177\342\202\000\163\367\314
+\065\352\216\044\233\345\010\131\307\004\214\163\170\376
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "DIGITALSIGN GLOBAL ROOT ECDSA CA"
+# Issuer: CN=DIGITALSIGN GLOBAL ROOT ECDSA CA,O=DigitalSign Certificadora Digital,C=PT
+# Serial Number:36:2d:8f:72:88:a2:28:27:e4:00:ff:24:c6:2d:e4:eb:fa:9d:b6:e1
+# Subject: CN=DIGITALSIGN GLOBAL ROOT ECDSA CA,O=DigitalSign Certificadora Digital,C=PT
+# Not Valid Before: Thu Jan 21 11:07:50 2021
+# Not Valid After : Mon Jan 15 11:07:50 2046
+# Fingerprint (SHA-256): 26:1D:71:14:AE:5F:8F:F2:D8:C7:20:9A:9D:E4:28:9E:6A:FC:9D:71:70:23:D8:54:50:90:91:99:F1:85:7C:FE
+# Fingerprint (SHA1): 67:A8:08:EB:8F:88:F5:80:6C:05:45:1B:17:F3:D7:00:2F:D2:4A:8A
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "DIGITALSIGN GLOBAL ROOT ECDSA CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\147\250\010\353\217\210\365\200\154\005\105\033\027\363\327\000
+\057\322\112\212
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\252\055\241\316\377\041\302\210\313\132\036\214\341\311\222\217
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\144\061\013\060\011\006\003\125\004\006\023\002\120\124\061
+\052\060\050\006\003\125\004\012\014\041\104\151\147\151\164\141
+\154\123\151\147\156\040\103\145\162\164\151\146\151\143\141\144
+\157\162\141\040\104\151\147\151\164\141\154\061\051\060\047\006
+\003\125\004\003\014\040\104\111\107\111\124\101\114\123\111\107
+\116\040\107\114\117\102\101\114\040\122\117\117\124\040\105\103
+\104\123\101\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\066\055\217\162\210\242\050\047\344\000\377\044\306\055
+\344\353\372\235\266\341
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Security Communication RootCA3"
+#
+# Issuer: CN=Security Communication RootCA3,O="SECOM Trust Systems CO.,LTD.",C=JP
+# Serial Number:00:e1:7c:37:40:fd:1b:fe:67
+# Subject: CN=Security Communication RootCA3,O="SECOM Trust Systems CO.,LTD.",C=JP
+# Not Valid Before: Thu Jun 16 06:17:16 2016
+# Not Valid After : Mon Jan 18 06:17:16 2038
+# Fingerprint (SHA-256): 24:A5:5C:2A:B0:51:44:2D:06:17:76:65:41:23:9A:4A:D0:32:D7:C5:51:75:AA:34:FF:DE:2F:BC:4F:5C:52:94
+# Fingerprint (SHA1): C3:03:C8:22:74:92:E5:61:A2:9C:5F:79:91:2B:1E:44:13:91:30:3A
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Security Communication RootCA3"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\135\061\013\060\011\006\003\125\004\006\023\002\112\120\061
+\045\060\043\006\003\125\004\012\023\034\123\105\103\117\115\040
+\124\162\165\163\164\040\123\171\163\164\145\155\163\040\103\117
+\056\054\114\124\104\056\061\047\060\045\006\003\125\004\003\023
+\036\123\145\143\165\162\151\164\171\040\103\157\155\155\165\156
+\151\143\141\164\151\157\156\040\122\157\157\164\103\101\063
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\135\061\013\060\011\006\003\125\004\006\023\002\112\120\061
+\045\060\043\006\003\125\004\012\023\034\123\105\103\117\115\040
+\124\162\165\163\164\040\123\171\163\164\145\155\163\040\103\117
+\056\054\114\124\104\056\061\047\060\045\006\003\125\004\003\023
+\036\123\145\143\165\162\151\164\171\040\103\157\155\155\165\156
+\151\143\141\164\151\157\156\040\122\157\157\164\103\101\063
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\011\000\341\174\067\100\375\033\376\147
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\177\060\202\003\147\240\003\002\001\002\002\011\000
+\341\174\067\100\375\033\376\147\060\015\006\011\052\206\110\206
+\367\015\001\001\014\005\000\060\135\061\013\060\011\006\003\125
+\004\006\023\002\112\120\061\045\060\043\006\003\125\004\012\023
+\034\123\105\103\117\115\040\124\162\165\163\164\040\123\171\163
+\164\145\155\163\040\103\117\056\054\114\124\104\056\061\047\060
+\045\006\003\125\004\003\023\036\123\145\143\165\162\151\164\171
+\040\103\157\155\155\165\156\151\143\141\164\151\157\156\040\122
+\157\157\164\103\101\063\060\036\027\015\061\066\060\066\061\066
+\060\066\061\067\061\066\132\027\015\063\070\060\061\061\070\060
+\066\061\067\061\066\132\060\135\061\013\060\011\006\003\125\004
+\006\023\002\112\120\061\045\060\043\006\003\125\004\012\023\034
+\123\105\103\117\115\040\124\162\165\163\164\040\123\171\163\164
+\145\155\163\040\103\117\056\054\114\124\104\056\061\047\060\045
+\006\003\125\004\003\023\036\123\145\143\165\162\151\164\171\040
+\103\157\155\155\165\156\151\143\141\164\151\157\156\040\122\157
+\157\164\103\101\063\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\343\311\162\111\367\060\336\011\174\251
+\100\201\130\323\264\072\335\272\141\017\223\120\156\151\074\065
+\302\356\133\163\220\033\147\114\041\354\137\065\273\071\076\053
+\012\140\357\273\155\053\206\373\161\242\310\254\344\126\224\371
+\311\257\261\162\324\040\254\164\322\270\025\255\121\376\205\164
+\241\271\020\376\005\200\371\122\223\263\100\075\165\020\254\300
+\226\267\247\176\166\274\343\033\122\031\316\021\037\013\004\064
+\365\330\365\151\074\167\363\144\364\015\252\205\336\340\011\120
+\004\027\226\204\267\310\212\274\115\162\374\034\273\317\363\006
+\115\371\237\144\367\176\246\146\206\065\161\310\021\200\114\301
+\161\100\130\036\276\240\163\366\374\076\120\341\340\057\046\075
+\176\134\043\265\171\160\336\372\340\321\245\326\014\101\161\173
+\367\352\214\034\210\307\354\213\365\321\057\125\226\106\174\132
+\073\130\073\373\272\330\055\265\045\332\172\116\317\104\256\041
+\246\236\230\312\040\156\174\273\210\205\133\373\300\020\142\273
+\362\371\047\107\357\321\211\071\103\304\337\336\341\101\277\124
+\163\040\227\055\154\332\363\324\007\243\346\271\330\157\256\374
+\214\031\056\323\147\147\053\225\333\130\134\265\152\002\363\270
+\203\136\264\153\276\101\176\127\011\165\104\120\125\315\132\021
+\141\041\012\141\302\251\210\375\023\274\055\211\057\315\141\340
+\225\276\312\265\173\341\173\064\147\013\037\266\014\307\174\036
+\031\123\312\247\261\112\025\040\126\024\160\075\053\202\054\017
+\235\025\035\107\200\107\377\170\231\016\061\257\157\076\217\355
+\206\151\036\173\030\210\024\262\302\374\202\063\056\234\113\055
+\373\160\073\161\252\053\173\046\047\363\032\302\334\373\027\270
+\241\352\313\240\264\256\323\224\176\172\320\253\303\354\070\055
+\021\056\210\277\324\077\255\022\073\102\254\217\002\156\175\314
+\321\137\141\276\241\274\072\152\110\352\046\125\042\026\135\137
+\015\377\047\063\237\030\003\164\212\133\122\040\107\153\105\115
+\042\167\214\125\047\360\257\036\214\311\203\042\124\267\232\320
+\117\331\316\374\331\056\034\226\050\261\002\323\003\275\045\122
+\034\064\146\117\043\253\364\167\202\226\035\321\127\060\010\021
+\005\375\127\321\331\307\002\003\001\000\001\243\102\060\100\060
+\035\006\003\125\035\016\004\026\004\024\144\024\174\374\130\162
+\026\246\012\051\064\025\157\052\313\274\374\257\250\253\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
+\015\006\011\052\206\110\206\367\015\001\001\014\005\000\003\202
+\002\001\000\334\002\043\010\342\357\041\072\307\015\267\046\322
+\142\223\247\245\043\162\007\040\202\140\337\030\327\124\255\151
+\045\222\236\331\024\317\231\271\122\201\317\256\154\212\073\132
+\071\310\154\001\103\302\042\155\002\360\142\315\116\143\103\300
+\024\332\364\143\360\352\364\161\356\116\207\343\161\251\364\311
+\127\345\056\137\034\171\273\043\252\207\104\127\351\275\065\115
+\101\273\113\050\243\230\262\033\331\013\027\007\345\367\352\235
+\365\166\327\277\304\266\201\130\377\310\377\144\151\142\171\255
+\156\016\037\177\356\035\151\345\267\162\161\263\376\245\001\065
+\224\124\053\300\122\155\217\125\304\311\322\270\313\312\064\010
+\121\205\240\365\274\264\027\130\352\012\134\172\275\143\306\072
+\057\377\226\111\031\204\352\147\330\004\261\141\364\000\133\112
+\267\234\161\067\031\205\171\277\201\260\307\023\016\166\161\076
+\072\200\006\256\006\026\247\215\265\302\304\313\377\100\245\134
+\215\245\311\072\355\162\201\312\134\230\074\322\064\003\167\010
+\375\360\051\131\135\041\010\307\140\277\244\161\173\270\331\036
+\202\276\011\257\145\157\050\253\277\113\265\356\076\010\107\047
+\240\017\157\017\213\077\254\225\030\363\271\016\334\147\125\156
+\142\236\106\016\321\004\170\312\162\256\166\331\245\370\262\337
+\210\011\141\213\357\044\116\321\131\077\132\324\075\311\223\074
+\053\144\365\201\015\026\226\367\222\303\376\061\157\350\052\062
+\164\016\364\114\230\112\030\016\060\124\325\305\353\274\305\025
+\236\350\231\041\353\047\053\011\012\333\361\346\160\030\126\273
+\014\344\276\371\350\020\244\023\222\270\034\340\333\147\035\123
+\003\244\042\247\334\135\222\020\074\352\377\374\033\020\032\303
+\330\320\234\235\145\313\320\053\047\061\003\036\066\341\075\166
+\165\014\377\105\046\271\335\121\274\043\307\137\330\330\207\020
+\100\022\015\075\070\067\347\104\074\030\300\123\011\144\217\377
+\325\232\246\174\160\056\163\125\041\350\337\377\203\271\035\076
+\062\036\326\246\175\054\361\146\351\134\035\247\243\316\136\045
+\062\053\343\225\254\052\007\316\264\050\170\206\074\055\246\235
+\115\322\164\060\335\144\121\025\333\203\203\121\327\257\375\063
+\235\115\146
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "Security Communication RootCA3"
+# Issuer: CN=Security Communication RootCA3,O="SECOM Trust Systems CO.,LTD.",C=JP
+# Serial Number:00:e1:7c:37:40:fd:1b:fe:67
+# Subject: CN=Security Communication RootCA3,O="SECOM Trust Systems CO.,LTD.",C=JP
+# Not Valid Before: Thu Jun 16 06:17:16 2016
+# Not Valid After : Mon Jan 18 06:17:16 2038
+# Fingerprint (SHA-256): 24:A5:5C:2A:B0:51:44:2D:06:17:76:65:41:23:9A:4A:D0:32:D7:C5:51:75:AA:34:FF:DE:2F:BC:4F:5C:52:94
+# Fingerprint (SHA1): C3:03:C8:22:74:92:E5:61:A2:9C:5F:79:91:2B:1E:44:13:91:30:3A
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Security Communication RootCA3"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\303\003\310\042\164\222\345\141\242\234\137\171\221\053\036\104
+\023\221\060\072
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\034\232\026\377\236\134\340\115\212\024\001\364\065\135\051\046
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\135\061\013\060\011\006\003\125\004\006\023\002\112\120\061
+\045\060\043\006\003\125\004\012\023\034\123\105\103\117\115\040
+\124\162\165\163\164\040\123\171\163\164\145\155\163\040\103\117
+\056\054\114\124\104\056\061\047\060\045\006\003\125\004\003\023
+\036\123\145\143\165\162\151\164\171\040\103\157\155\155\165\156
+\151\143\141\164\151\157\156\040\122\157\157\164\103\101\063
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\011\000\341\174\067\100\375\033\376\147
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Security Communication ECC RootCA1"
+#
+# Issuer: CN=Security Communication ECC RootCA1,O="SECOM Trust Systems CO.,LTD.",C=JP
+# Serial Number:00:d6:5d:9b:b3:78:81:2e:eb
+# Subject: CN=Security Communication ECC RootCA1,O="SECOM Trust Systems CO.,LTD.",C=JP
+# Not Valid Before: Thu Jun 16 05:15:28 2016
+# Not Valid After : Mon Jan 18 05:15:28 2038
+# Fingerprint (SHA-256): E7:4F:BD:A5:5B:D5:64:C4:73:A3:6B:44:1A:A7:99:C8:A6:8E:07:74:40:E8:28:8B:9F:A1:E5:0E:4B:BA:CA:11
+# Fingerprint (SHA1): B8:0E:26:A9:BF:D2:B2:3B:C0:EF:46:C9:BA:C7:BB:F6:1D:0D:41:41
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Security Communication ECC RootCA1"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\141\061\013\060\011\006\003\125\004\006\023\002\112\120\061
+\045\060\043\006\003\125\004\012\023\034\123\105\103\117\115\040
+\124\162\165\163\164\040\123\171\163\164\145\155\163\040\103\117
+\056\054\114\124\104\056\061\053\060\051\006\003\125\004\003\023
+\042\123\145\143\165\162\151\164\171\040\103\157\155\155\165\156
+\151\143\141\164\151\157\156\040\105\103\103\040\122\157\157\164
+\103\101\061
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\141\061\013\060\011\006\003\125\004\006\023\002\112\120\061
+\045\060\043\006\003\125\004\012\023\034\123\105\103\117\115\040
+\124\162\165\163\164\040\123\171\163\164\145\155\163\040\103\117
+\056\054\114\124\104\056\061\053\060\051\006\003\125\004\003\023
+\042\123\145\143\165\162\151\164\171\040\103\157\155\155\165\156
+\151\143\141\164\151\157\156\040\105\103\103\040\122\157\157\164
+\103\101\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\011\000\326\135\233\263\170\201\056\353
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\070\060\202\001\276\240\003\002\001\002\002\011\000
+\326\135\233\263\170\201\056\353\060\012\006\010\052\206\110\316
+\075\004\003\003\060\141\061\013\060\011\006\003\125\004\006\023
+\002\112\120\061\045\060\043\006\003\125\004\012\023\034\123\105
+\103\117\115\040\124\162\165\163\164\040\123\171\163\164\145\155
+\163\040\103\117\056\054\114\124\104\056\061\053\060\051\006\003
+\125\004\003\023\042\123\145\143\165\162\151\164\171\040\103\157
+\155\155\165\156\151\143\141\164\151\157\156\040\105\103\103\040
+\122\157\157\164\103\101\061\060\036\027\015\061\066\060\066\061
+\066\060\065\061\065\062\070\132\027\015\063\070\060\061\061\070
+\060\065\061\065\062\070\132\060\141\061\013\060\011\006\003\125
+\004\006\023\002\112\120\061\045\060\043\006\003\125\004\012\023
+\034\123\105\103\117\115\040\124\162\165\163\164\040\123\171\163
+\164\145\155\163\040\103\117\056\054\114\124\104\056\061\053\060
+\051\006\003\125\004\003\023\042\123\145\143\165\162\151\164\171
+\040\103\157\155\155\165\156\151\143\141\164\151\157\156\040\105
+\103\103\040\122\157\157\164\103\101\061\060\166\060\020\006\007
+\052\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142
+\000\004\244\245\157\140\003\003\303\275\061\364\323\027\234\053
+\204\165\254\345\375\075\127\156\327\143\277\346\004\211\222\216
+\201\234\343\351\107\156\312\220\022\310\023\340\247\235\367\145
+\164\037\154\020\262\350\344\351\357\155\205\062\231\104\261\136
+\375\314\166\020\330\133\275\242\306\371\326\102\344\127\166\334
+\220\302\065\251\113\210\074\022\107\155\134\377\111\117\032\112
+\120\261\243\102\060\100\060\035\006\003\125\035\016\004\026\004
+\024\206\034\347\376\055\245\112\213\010\376\050\021\372\276\243
+\146\370\140\131\057\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\012\006\010\052\206\110\316\075\004
+\003\003\003\150\000\060\145\002\060\025\135\102\075\374\266\356
+\367\073\261\066\350\236\366\304\106\050\111\063\320\130\103\052
+\143\051\314\115\261\264\172\242\271\015\070\245\135\110\052\375
+\313\262\163\135\243\210\010\307\014\002\061\000\300\253\055\016
+\155\355\030\242\333\123\351\045\333\125\010\340\120\314\337\104
+\141\026\202\253\111\260\262\201\354\163\207\170\264\114\262\142
+\033\022\372\026\115\045\113\143\275\036\067\331
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "Security Communication ECC RootCA1"
+# Issuer: CN=Security Communication ECC RootCA1,O="SECOM Trust Systems CO.,LTD.",C=JP
+# Serial Number:00:d6:5d:9b:b3:78:81:2e:eb
+# Subject: CN=Security Communication ECC RootCA1,O="SECOM Trust Systems CO.,LTD.",C=JP
+# Not Valid Before: Thu Jun 16 05:15:28 2016
+# Not Valid After : Mon Jan 18 05:15:28 2038
+# Fingerprint (SHA-256): E7:4F:BD:A5:5B:D5:64:C4:73:A3:6B:44:1A:A7:99:C8:A6:8E:07:74:40:E8:28:8B:9F:A1:E5:0E:4B:BA:CA:11
+# Fingerprint (SHA1): B8:0E:26:A9:BF:D2:B2:3B:C0:EF:46:C9:BA:C7:BB:F6:1D:0D:41:41
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Security Communication ECC RootCA1"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\270\016\046\251\277\322\262\073\300\357\106\311\272\307\273\366
+\035\015\101\101
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\176\103\260\222\150\354\005\103\114\230\253\135\065\056\176\206
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\141\061\013\060\011\006\003\125\004\006\023\002\112\120\061
+\045\060\043\006\003\125\004\012\023\034\123\105\103\117\115\040
+\124\162\165\163\164\040\123\171\163\164\145\155\163\040\103\117
+\056\054\114\124\104\056\061\053\060\051\006\003\125\004\003\023
+\042\123\145\143\165\162\151\164\171\040\103\157\155\155\165\156
+\151\143\141\164\151\157\156\040\105\103\103\040\122\157\157\164
+\103\101\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\011\000\326\135\233\263\170\201\056\353
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
--- a/security/nss/lib/ckfw/builtins/nssckbi.h
+++ b/security/nss/lib/ckfw/builtins/nssckbi.h
@ -46,8 +46,8 @@
 * It's recommend to switch back to 0 after having reached version 98/99.
 */
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 56
-#define NSS_BUILTINS_LIBRARY_VERSION "2.56"
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 58
+#define NSS_BUILTINS_LIBRARY_VERSION "2.58"

 /* These version numbers detail the semantic changes to the ckfw engine. */
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
--- a/security/nss/lib/dbm/config/config.mk
+++ b/security/nss/lib/dbm/config/config.mk
@ -15,17 +15,9 @@ 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 DGUX NCR ReliantUNIX SCO_SV SCOOS UNIXWARE,$(OS_TARGET)))
+ifeq (,$(filter-out NCR ReliantUNIX SCO_SV SCOOS UNIXWARE,$(OS_TARGET)))
 DEFINES += -DHAVE_SYS_BYTEORDER_H
 endif

--- a/security/nss/lib/dbm/include/mcom_db.h
+++ b/security/nss/lib/dbm/include/mcom_db.h
@ -40,7 +40,7 @@
 #endif
 #include "prtypes.h"

-#if !defined(XP_BEOS) && !defined(XP_OS2) && !defined(XP_UNIX) || defined(NTO)
+#if !defined(XP_OS2) && !defined(XP_UNIX) || defined(NTO)
 typedef PRUintn uint;
 #endif
 typedef PRUint8 uint8;
@ -60,7 +60,7 @@ typedef PRUint32 uint32;
 #include <sys/byteorder.h>
 #endif

-#if defined(__linux) || defined(__BEOS__)
+#if defined(__linux)
 #include <endian.h>
 #ifndef BYTE_ORDER
 #define BYTE_ORDER __BYTE_ORDER
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@ -175,11 +175,6 @@ endif
    endif
 endif

-ifeq ($(OS_TARGET),OSF1)
-    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
-    MPI_SRCS += mpvalpha.c
-endif
-
 ifeq (OS2,$(OS_TARGET))
    ASFILES  = mpi_x86_os2.s
    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
@ -260,19 +255,6 @@ endif
 endif
 endif

-ifeq ($(OS_TARGET),IRIX)
-ifeq ($(USE_N32),1)
-    ASFILES  = mpi_mips.s
-    ifeq ($(NS_USE_GCC),1)
-	ASFLAGS = -Wp,-P -Wp,-traditional -O -mips3
-    else
-	ASFLAGS = -O -OPT:Olimit=4000 -dollar -fullwarn -xansi -n32 -mips3
-    endif
-    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
-    DEFINES += -DMP_USE_UINT_DIGIT
-endif
-endif
-
 ifeq ($(OS_TARGET),Darwin)
 ifeq ($(CPU_ARCH),x86_64)
    ASFILES  = mpi_amd64_common.s
--- a/security/nss/lib/freebl/arcfour.c
+++ b/security/nss/lib/freebl/arcfour.c
@ -22,7 +22,7 @@
 #define CONVERT_TO_WORDS
 #endif

-#if defined(AIX) || defined(OSF1) || defined(NSS_BEVAND_ARCFOUR)
+#if defined(AIX) || defined(NSS_BEVAND_ARCFOUR)
 /* Treat array variables as words, not bytes, on CPUs that take
 * much longer to write bytes than to write words, or when using
 * assembler code that required it.
--- a/security/nss/lib/freebl/mpi/mpi.c
+++ b/security/nss/lib/freebl/mpi/mpi.c
@ -9,9 +9,6 @@

 #include "mpi-priv.h"
 #include "mplogic.h"
-#if defined(OSF1)
-#include <c_asm.h>
-#endif

 #if defined(__arm__) && \
    ((defined(__thumb__) && !defined(__thumb2__)) || defined(__ARM_ARCH_3__))
@ -3930,12 +3927,6 @@ s_mp_mul(mp_int *a, const mp_int *b)
        Plo = (mp_digit)product;                                \
        Phi = (mp_digit)(product >> MP_DIGIT_BIT);              \
    }
-#elif defined(OSF1)
-#define MP_MUL_DxD(a, b, Phi, Plo)              \
-    {                                           \
-        Plo = asm("mulq %a0, %a1, %v0", a, b);  \
-        Phi = asm("umulh %a0, %a1, %v0", a, b); \
-    }
 #else
 #define MP_MUL_DxD(a, b, Phi, Plo)                                 \
    {                                                              \
@ -4081,12 +4072,6 @@ s_mpv_mul_d_add_prop(const mp_digit *a, mp_size a_len, mp_digit b, mp_digit *c)
        Plo = (mp_digit)square;                                \
        Phi = (mp_digit)(square >> MP_DIGIT_BIT);              \
    }
-#elif defined(OSF1)
-#define MP_SQR_D(a, Phi, Plo)                \
-    {                                        \
-        Plo = asm("mulq  %a0, %a0, %v0", a); \
-        Phi = asm("umulh %a0, %a0, %v0", a); \
-    }
 #else
 #define MP_SQR_D(a, Phi, Plo)                                      \
    {                                                              \
--- a/security/nss/lib/freebl/mpi/mpi.h
+++ b/security/nss/lib/freebl/mpi/mpi.h
@ -64,7 +64,7 @@ typedef int mp_err;
 /* MP_ULONG_LONG_MAX was defined to be ULLONG_MAX */
 #elif defined(ULONG_LONG_MAX) /* HPUX */
 #define MP_ULONG_LONG_MAX ULONG_LONG_MAX
-#elif defined(ULONGLONG_MAX) /* IRIX, AIX */
+#elif defined(ULONGLONG_MAX) /* AIX */
 #define MP_ULONG_LONG_MAX ULONGLONG_MAX
 #endif

--- a/security/nss/lib/freebl/sysrand.c
+++ b/security/nss/lib/freebl/sysrand.c
@ -8,9 +8,9 @@

 #include "seccomon.h"

-#if (defined(XP_UNIX) || defined(XP_BEOS)) && defined(SEED_ONLY_DEV_URANDOM)
+#if defined(XP_UNIX) && defined(SEED_ONLY_DEV_URANDOM)
 #include "unix_urandom.c"
-#elif defined(XP_UNIX) || defined(XP_BEOS)
+#elif defined(XP_UNIX)
 #include "unix_rand.c"
 #endif
 #ifdef XP_WIN
--- a/security/nss/lib/freebl/unix_rand.c
+++ b/security/nss/lib/freebl/unix_rand.c
@ -287,49 +287,6 @@ GiveSystemInfo(void)
 }
 #endif /* HPUX */

-#if defined(OSF1)
-#include <sys/types.h>
-#include <sys/sysinfo.h>
-#include <sys/systeminfo.h>
-#include <c_asm.h>
-
-static void
-GiveSystemInfo(void)
-{
-    char buf[BUFSIZ];
-    int rv;
-    int off = 0;
-
-    rv = sysinfo(SI_MACHINE, buf, sizeof(buf));
-    if (rv > 0) {
-        RNG_RandomUpdate(buf, rv);
-    }
-    rv = sysinfo(SI_RELEASE, buf, sizeof(buf));
-    if (rv > 0) {
-        RNG_RandomUpdate(buf, rv);
-    }
-    rv = sysinfo(SI_HW_SERIAL, buf, sizeof(buf));
-    if (rv > 0) {
-        RNG_RandomUpdate(buf, rv);
-    }
-}
-
-/*
- * Use the "get the cycle counter" instruction on the alpha.
- * The low 32 bits completely turn over in less than a minute.
- * The high 32 bits are some non-counter gunk that changes sometimes.
- */
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    unsigned long t;
-
-    t = asm("rpcc %v0");
-    return CopyLowBits(buf, maxbytes, &t, sizeof(t));
-}
-
-#endif /* Alpha */
-
 #if defined(_IBMR2)
 static size_t
 GetHighResClock(void *buf, size_t maxbytes)
@ -586,39 +543,6 @@ GiveSystemInfo(void)
 }
 #endif /* sinix */

-#ifdef BEOS
-#include <be/kernel/OS.h>
-
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    bigtime_t bigtime; /* Actually a int64 */
-
-    bigtime = real_time_clock_usecs();
-    return CopyLowBits(buf, maxbytes, &bigtime, sizeof(bigtime));
-}
-
-static void
-GiveSystemInfo(void)
-{
-    system_info *info = NULL;
-    PRInt32 val;
-    get_system_info(info);
-    if (info) {
-        val = info->boot_time;
-        RNG_RandomUpdate(&val, sizeof(val));
-        val = info->used_pages;
-        RNG_RandomUpdate(&val, sizeof(val));
-        val = info->used_ports;
-        RNG_RandomUpdate(&val, sizeof(val));
-        val = info->used_threads;
-        RNG_RandomUpdate(&val, sizeof(val));
-        val = info->used_teams;
-        RNG_RandomUpdate(&val, sizeof(val));
-    }
-}
-#endif /* BEOS */
-
 #if defined(nec_ews)
 #include <sys/systeminfo.h>

@ -692,16 +616,6 @@ RNG_SystemInfoForRNG(void)
 #else
    extern char **environ;
 #endif
-#ifdef BEOS
-    static const char *const files[] = {
-        "/boot/var/swap",
-        "/boot/var/log/syslog",
-        "/boot/var/tmp",
-        "/boot/home/config/settings",
-        "/boot/home",
-        0
-    };
-#else
    static const char *const files[] = {
        "/etc/passwd",
        "/etc/utmp",
@ -710,7 +624,6 @@ RNG_SystemInfoForRNG(void)
        "/usr/tmp",
        0
    };
-#endif

    GiveSystemInfo();

--- a/security/nss/lib/jar/jar.h
+++ b/security/nss/lib/jar/jar.h
@ -140,7 +140,7 @@ typedef struct JAR_Physical_ {
    unsigned long offset;
    unsigned long length;
    unsigned long uncompressed_length;
-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)
    PRUint16 mode;
 #endif
 } JAR_Physical;
--- a/security/nss/lib/jar/jarfile.c
+++ b/security/nss/lib/jar/jarfile.c
@ -16,7 +16,7 @@
 /* commercial compression */
 #include "jzlib.h"

-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)
 #include "sys/stat.h"
 #endif

@ -219,7 +219,7 @@ JAR_extract(JAR *jar, char *path, char *outpath)
                                          (unsigned int)phy->compression);
        }

-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)
        if (phy->mode)
            chmod(outpath, 0400 | (mode_t)phy->mode);
 #endif
@ -762,7 +762,7 @@ jar_listzip(JAR *jar, JAR_FILE fp)
                goto loser;
            }

-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)
            /* with unix we need to locate any bits from
               the protection mask in the external attributes. */
            attr = Central->external_attributes[2]; /* magic */
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@ -22,9 +22,9 @@
 * The format of the version string should be
 *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
 */
-#define NSS_VERSION "3.82" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.83" _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR 3
-#define NSS_VMINOR 82
+#define NSS_VMINOR 83
 #define NSS_VPATCH 0
 #define NSS_VBUILD 0
 #define NSS_BETA PR_TRUE
--- a/security/nss/lib/nss/nssinit.c
+++ b/security/nss/lib/nss/nssinit.c
@ -261,7 +261,7 @@ static const char *dllname =
    "libnssckbi.sl";
 #elif defined(DARWIN)
    "libnssckbi.dylib";
-#elif defined(XP_UNIX) || defined(XP_BEOS)
+#elif defined(XP_UNIX)
    "libnssckbi.so";
 #else
 #error "Uh! Oh! I don't know about this platform."
--- a/security/nss/lib/pkcs12/p12d.c
+++ b/security/nss/lib/pkcs12/p12d.c
@ -2770,7 +2770,7 @@ SEC_PKCS12DecoderValidateBags(SEC_PKCS12DecoderContext *p12dcx,
                              SEC_PKCS12NicknameCollisionCallback nicknameCb)
 {
    SECStatus rv;
-    int i, noInstallCnt, probCnt, bagCnt, errorVal = 0;
+    int i, probCnt, errorVal = 0;
    if (!p12dcx || p12dcx->error || !p12dcx->safeBags) {
        PORT_SetError(SEC_ERROR_INVALID_ARGS);
        return SECFailure;
@ -2781,12 +2781,9 @@ SEC_PKCS12DecoderValidateBags(SEC_PKCS12DecoderContext *p12dcx,
        p12dcx->bagsVerified = PR_TRUE;
    }

-    noInstallCnt = probCnt = bagCnt = 0;
+    probCnt = 0;
    i = 0;
    while (p12dcx->safeBags[i]) {
-        bagCnt++;
-        if (p12dcx->safeBags[i]->noInstall)
-            noInstallCnt++;
        if (p12dcx->safeBags[i]->problem) {
            probCnt++;
            errorVal = p12dcx->safeBags[i]->error;
@ -2794,15 +2791,6 @@ SEC_PKCS12DecoderValidateBags(SEC_PKCS12DecoderContext *p12dcx,
        i++;
    }

-    /* formerly was erroneous code here that assumed that if all bags
-     * failed to import, then the problem was duplicated data;
-     * that is, it assume that the problem must be that the file had
-     * previously been successfully imported.  But importing a
-     * previously imported file causes NO ERRORS at all, and this
-     * false assumption caused real errors to be hidden behind false
-     * errors about duplicated data.
-     */
-
    if (probCnt) {
        PORT_SetError(errorVal);
        return SECFailure;
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@ -17,9 +17,9 @@
 * The format of the version string should be
 *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
 */
-#define SOFTOKEN_VERSION "3.82" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.83" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 82
+#define SOFTOKEN_VMINOR 83
 #define SOFTOKEN_VPATCH 0
 #define SOFTOKEN_VBUILD 0
 #define SOFTOKEN_BETA PR_TRUE
--- a/security/nss/lib/ssl/config.mk
+++ b/security/nss/lib/ssl/config.mk
@ -44,10 +44,6 @@ EXTRA_SHARED_LIBS += \
 	-lnspr4 \
 	$(NULL)

-ifeq ($(OS_ARCH), BeOS)
-EXTRA_SHARED_LIBS += -lbe
-endif
-
 endif

 ifdef NSS_DISABLE_TLS_1_3
--- a/security/nss/lib/ssl/sslimpl.h
+++ b/security/nss/lib/ssl/sslimpl.h
@ -24,7 +24,7 @@
 #include "hasht.h"
 #include "nssilock.h"
 #include "pkcs11t.h"
-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)
 #include "unistd.h"
 #endif
 #include "nssrwlk.h"
@ -1982,7 +1982,7 @@ SECStatus SSLExp_CallExtensionWriterOnEchInner(PRFileDesc *fd, PRBool enabled);

 SEC_END_PROTOS

-#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
+#if defined(XP_UNIX) || defined(XP_OS2)
 #define SSL_GETPID getpid
 #elif defined(WIN32)
 extern int __cdecl _getpid(void);
--- a/security/nss/lib/ssl/sslmutex.c
+++ b/security/nss/lib/ssl/sslmutex.c
@ -4,7 +4,7 @@

 #include "seccomon.h"
 /* This ifdef should match the one in sslsnce.c */
-#if defined(XP_UNIX) || defined(XP_WIN32) || defined(XP_OS2) || defined(XP_BEOS)
+#if defined(XP_UNIX) || defined(XP_WIN32) || defined(XP_OS2)

 #include "sslmutex.h"
 #include "prerr.h"
@ -60,7 +60,7 @@ single_process_sslMutex_Lock(sslMutex* pMutex)
    return SECSuccess;
 }

-#if defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || \
+#if defined(LINUX) || defined(AIX) || defined(BSDI) || \
    (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD) || defined(__GLIBC__)

 #include <unistd.h>
--- a/security/nss/lib/ssl/sslmutex.h
+++ b/security/nss/lib/ssl/sslmutex.h
@ -49,7 +49,7 @@ typedef struct {

 typedef int sslPID;

-#elif defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || \
+#elif defined(LINUX) || defined(AIX) || defined(BSDI) || \
    (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD) || defined(__GLIBC__)

 #include <sys/types.h>
--- a/security/nss/lib/ssl/sslnonce.c
+++ b/security/nss/lib/ssl/sslnonce.c
@ -16,7 +16,7 @@
 #include "sslproto.h"
 #include "nssilock.h"
 #include "sslencode.h"
-#if defined(XP_UNIX) || defined(XP_WIN) || defined(_WINDOWS) || defined(XP_BEOS)
+#if defined(XP_UNIX) || defined(XP_WIN) || defined(_WINDOWS)
 #include <time.h>
 #endif

--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@ -45,7 +45,7 @@
 */
 #include "seccomon.h"

-#if defined(XP_UNIX) || defined(XP_WIN32) || defined(XP_OS2) || defined(XP_BEOS)
+#if defined(XP_UNIX) || defined(XP_WIN32) || defined(XP_OS2)

 #include "cert.h"
 #include "ssl.h"
@ -60,7 +60,7 @@
 #include "selfencrypt.h"
 #include <stdio.h>

-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)

 #include <syslog.h>
 #include <fcntl.h>
@ -237,8 +237,6 @@ static PRBool isMultiProcess = PR_FALSE;

 #if defined(AIX) || defined(LINUX) || defined(NETBSD) || defined(OPENBSD)
 #define MAX_SID_CACHE_LOCKS 8 /* two FDs per lock */
-#elif defined(OSF1)
-#define MAX_SID_CACHE_LOCKS 16 /* one FD per lock */
 #else
 #define MAX_SID_CACHE_LOCKS 256
 #endif
@ -268,11 +266,11 @@ typedef struct inheritanceStr inheritance;

 #endif /* _win32 */

-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)

 #define DEFAULT_CACHE_DIRECTORY "/tmp"

-#endif /* XP_UNIX || XP_BEOS */
+#endif /* XP_UNIX */

 /************************************************************************/

@ -1047,7 +1045,7 @@ InitCache(cacheDesc *cache, int maxCacheEntries, int maxCertCacheEntries,

    if (shared) {
 /* Create file names */
-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)
        /* there's some confusion here about whether PR_OpenAnonFileMap wants
        ** a directory name or a file name for its first argument.
        cfn = PR_smprintf("%s/.sslsvrcache.%d", directory, myPid);
@ -1231,7 +1229,7 @@ SSL_ShutdownServerSessionIDCacheInstance(cacheDesc *cache)
 SECStatus
 SSL_ShutdownServerSessionIDCache(void)
 {
-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)
    /* Stop the thread that polls cache for expired locks on Unix */
    StopLockPoller(&globalCache);
 #endif
@ -1295,7 +1293,7 @@ ssl_ConfigMPServerSIDCacheWithOpt(PRUint32 ssl3_timeout,
        result = SECFailure;
    }

-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)
    /* Launch thread to poll cache for expired locks on Unix */
    LaunchLockPoller(cache);
 #endif
@ -1519,7 +1517,7 @@ SSL_InheritMPServerSIDCache(const char *envString)
    return SSL_InheritMPServerSIDCacheInstance(&globalCache, envString);
 }

-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)

 #define SID_LOCK_EXPIRATION_TIMEOUT 30 /* seconds */

--- a/security/nss/lib/ssl/sslsock.c
+++ b/security/nss/lib/ssl/sslsock.c
@ -3890,7 +3890,7 @@ loser:
    return SECFailure;
 }

-#if defined(XP_UNIX) || defined(XP_WIN32) || defined(XP_BEOS)
+#if defined(XP_UNIX) || defined(XP_WIN32)
 #define NSS_HAVE_GETENV 1
 #endif

--- a/security/nss/lib/ssl/unix_err.c
+++ b/security/nss/lib/ssl/unix_err.c
@ -18,7 +18,7 @@
 #include "prerror.h"
 #endif

-#if defined(__bsdi__) || defined(NTO) || defined(DARWIN) || defined(BEOS)
+#if defined(__bsdi__) || defined(NTO) || defined(DARWIN)
 #undef _PR_POLL_AVAILABLE
 #endif

--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@ -19,9 +19,9 @@
 * The format of the version string should be
 *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
 */
-#define NSSUTIL_VERSION "3.82 Beta"
+#define NSSUTIL_VERSION "3.83 Beta"
 #define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 82
+#define NSSUTIL_VMINOR 83
 #define NSSUTIL_VPATCH 0
 #define NSSUTIL_VBUILD 0
 #define NSSUTIL_BETA PR_TRUE
--- a/security/nss/lib/util/secport.c
+++ b/security/nss/lib/util/secport.c
@ -31,7 +31,7 @@
 #include "prthread.h"
 #endif /* THREADMARK */

-#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
+#if defined(XP_UNIX) || defined(XP_OS2)
 #include <stdlib.h>
 #else
 #include "wtypes.h"
--- a/security/nss/lib/util/secport.h
+++ b/security/nss/lib/util/secport.h
@ -13,7 +13,7 @@
 #include "prlink.h"

 /*
- * define XP_WIN, XP_BEOS, or XP_UNIX, in case they are not defined
+ * define XP_WIN, or XP_UNIX, in case they are not defined
 * by anyone else
 */
 #ifdef _WINDOWS
@ -27,12 +27,6 @@
 #endif
 #endif

-#ifdef __BEOS__
-#ifndef XP_BEOS
-#define XP_BEOS
-#endif
-#endif
-
 #ifdef unix
 #ifndef XP_UNIX
 #define XP_UNIX
--- a/security/nss/lib/zlib/zconf.h
+++ b/security/nss/lib/zlib/zconf.h
@ -361,18 +361,6 @@
 #  endif
 #endif

-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
 #ifndef ZEXTERN
 #  define ZEXTERN extern
 #endif
--- a/security/nss/lib/zlib/zutil.h
+++ b/security/nss/lib/zlib/zutil.h
@ -170,7 +170,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define OS_CODE 19
 #endif

-#if defined(_BEOS_) || defined(RISCOS)
+#if defined(RISCOS)
 #  define fdopen(fd,mode) NULL /* No fdopen() */
 #endif

--- a/security/nss/tests/header
+++ b/security/nss/tests/header
@ -314,7 +314,6 @@ map_os64()
 {
  IS_64=""
  case `uname -s` in
-      #OSF1) has been done already - always 64 bit
      SunOS)
          MAPPED_OS=Solaris*8
          IS_64=`(isainfo -v | grep 64)>/dev/null 2>/dev/null && echo 64 bit`
@ -1200,7 +1199,7 @@ bc()
 ########################################################################
 Ps()
 {
-#AIX, OSF ps -ef, solaris /usr/5bin/ps -ef, win ps -ef but no user id
+#AIX, ps -ef, solaris /usr/5bin/ps -ef, win ps -ef but no user id
 #linux ps -ef, HP

    if [ $os_name = "SunOS" ]
--- a/security/nss/tests/mksymlinks
+++ b/security/nss/tests/mksymlinks
@ -54,18 +54,6 @@ fi

 ErrorFlag=0

-#if [  ! -h OSF1V5.1_DBG.OBJ -a ! -d OSF1V5.1_DBG.OBJ ] ; then 
-    #ln -s OSF1V4.0D_DBG.OBJ OSF1V5.1_DBG.OBJ || ErrorFlag=1
-#fi
-#if [  ! -h OSF1V5.1_OPT.OBJ -a ! -d OSF1V5.1_OPT.OBJ ] ; then 
-    #ln -s OSF1V4.0D_OPT.OBJ OSF1V5.1_OPT.OBJ || ErrorFlag=1
-#fi
-#if [  ! -h OSF1V5.0_DBG.OBJ -a ! -d OSF1V5.0_DBG.OBJ ] ; then 
-    #ln -s OSF1V4.0D_DBG.OBJ OSF1V5.0_DBG.OBJ || ErrorFlag=1
-#fi
-#if [  ! -h OSF1V5.0_OPT.OBJ -a ! -d OSF1V5.0_OPT.OBJ ] ; then 
-    #ln -s OSF1V4.0D_OPT.OBJ OSF1V5.0_OPT.OBJ || ErrorFlag=1
-#fi
 if [  ! -h SunOS5.9_64_DBG.OBJ  -a ! -d  SunOS5.9_64_DBG.OBJ ] ; then 
    ln -s SunOS5.8_64_DBG.OBJ SunOS5.9_64_DBG.OBJ || ErrorFlag=1
 fi
--- a/security/nss/tests/nssqa
+++ b/security/nss/tests/nssqa
@ -143,9 +143,6 @@ map_os32()
                MAPPED_OS=Solaris8_forte6
            fi
            ;;
-        OSF1)
-            MAPPED_OS=OSF1V4.0
-            ;;
        Darwin)
            MAPPED_OS=Darwin6.5
            ;;	
@ -190,8 +187,7 @@ nssqa_main()

  if [ $O_WIN = "OFF" -a "$O_TBX" = "OFF" -a $O_LOCAL = "OFF" ] ; then
      if [ ! -h ${NTDIST}/WINNT5.0_DBG.OBJ -o \
-              ! -h ${UXDIST}/SunOS5.8_OPT.OBJ -o \
-              ! -h ${UXDIST}/OSF1V5.0_DBG.OBJ ] ; then
+              ! -h ${UXDIST}/SunOS5.8_OPT.OBJ -o ] ; then
          # determine if all needed symbolic links are present, in case
          # we build on one platform and QA on another
          # create the symbolic links
--- a/security/nss/tests/platformlist.tbx
+++ b/security/nss/tests/platformlist.tbx
@ -2,8 +2,6 @@ AIX_3_32_bit AIX4.3_DBG.OBJ AIX4.3_OPT.OBJ
 AIX_3_64_bit AIX4.3_DBG.OBJ AIX4.3_OPT.OBJ AIX4.3_64_DBG.OBJ AIX4.3_64_OPT.OBJ
 HP-UX_B.11.00_32_bit  HP-UXB.11.00_DBG.OBJ HP-UXB.11.00_OPT.OBJ
 HP-UX_B.11.00_64_bit  HP-UXB.11.00_DBG.OBJ HP-UXB.11.00_OPT.OBJ 
-OSF1_V4.0 OSF1V4.0D_DBG.OBJ OSF1V4.0D_OPT.OBJ
-OSF1_V5.0 OSF1V5.0_DBG.OBJ OSF1V5.0_OPT.OBJ
 RH_Linux_6.2_(Zoot) Linux2.2_x86_glibc_PTH_DBG.OBJ Linux2.2_x86_glibc_PTH_OPT.OBJ
 RH_Linux_6.1_(Cartman) Linux2.2_x86_glibc_PTH_DBG.OBJ Linux2.2_x86_glibc_PTH_OPT.OBJ
 RH_Linux_6.0_(Hedwig) Linux2.2_x86_glibc_PTH_DBG.OBJ Linux2.2_x86_glibc_PTH_OPT.OBJ
--- a/security/nss/tests/set_environment
+++ b/security/nss/tests/set_environment
@ -92,18 +92,6 @@ then
     fi
    export XAPPLRESDIR  OPENWINHOME LD_LIBRARY_PATH

-elif [ "$os_name" = "IRIX" ]
-then
-    PATH=$PATH:/tools/ns/bin:/usr/local/bin:/etc:/usr/bsd
-    MANPATH=/tools/ns/man:/usr/local/man
-    JAVA_HOME="/share/builds/components/jdk/1.2.2/IRIX"
-    JAVA_HOME14=$JAVA_HOME
-elif [ "$os_name" = "IRIX64" ]
-then
-    PATH=$PATH:/tools/ns/bin:/usr/local/bin:/etc:/usr/bsd
-    MANPATH=/tools/ns/man:/usr/local/man
-    JAVA_HOME="/share/builds/components/jdk/1.2.2/IRIX"
-    JAVA_HOME14=$JAVA_HOME
 elif [ "$os_name" = "Linux" ]
 then
    PATH=/lib:/usr/lib:/bin:/sbin:/usr/bin:/usr/sbin:$PATH
@ -121,19 +109,6 @@ then
    export TERM
    JAVA_HOME="/share/builds/components/cms_jdk/AIX/1.3.0"
    JAVA_HOME14=$JAVA_HOME
-elif [ "$os_name" = "OSF1" ]
-then
-    PATH=$PATH:/usr/local/bin
-    JAVA_HOME="/share/builds/components/jdk/1.2.2/OSF1"
-    JAVA_HOME14=$JAVA_HOME
-fi
-
-if [ "$os_name" = "IRIX" ]
-then
-    PATH=/tools/ns-arch/soft/perl-5.004_04/run/default/mips_sgi_irix5.3/bin:$PATH
-elif [ "$os_name" = "IRIX64" ]
-then
-    PATH=/tools/ns-arch/soft/perl-5.004_04/run/default/mips_sgi_irix5.3/bin:$PATH
 fi

 O_CYGNUS=OFF