fixup commit for tag 'NSS_CLIENT_TAG_20041008'NSS_CLIENT_TAG_20041008

14 files changed, 39 insertions, 131 deletions

diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk
index 5b3b51d0b..a8eed088f 100644
--- a/security/coreconf/OS2.mk
+++ b/security/coreconf/OS2.mk
@@ -54,8 +54,7 @@ LIB_PREFIX  = $(NULL)
 
 # Override suffix in suffix.mk
 LIB_SUFFIX  = lib
-# the DLL_SUFFIX must be uppercase for FIPS mode to work. bugzilla 240784
-DLL_SUFFIX  = DLL
+DLL_SUFFIX  = dll
 PROG_SUFFIX = .exe
 
 
diff --git a/security/coreconf/WIN32.mk b/security/coreconf/WIN32.mk
index d275300b2..18a027354 100644
--- a/security/coreconf/WIN32.mk
+++ b/security/coreconf/WIN32.mk
@@ -116,7 +116,12 @@ else # !NS_USE_GCC
 	#
 	ifdef MOZ_PROFILE
 		OPTIMIZER += -Z7
-		DLLFLAGS += -DEBUG -DEBUGTYPE:CV
+	endif
+	ifdef MOZ_DEBUG_SYMBOLS
+		OPTIMIZER += -Zi
+	endif
+	ifneq (,$(MOZ_PROFILE)$(MOZ_DEBUG_SYMBOLS))
+		DLLFLAGS += -DEBUG -OPT:REF
 	endif
     else
 	#
@@ -135,9 +140,9 @@ else # !NS_USE_GCC
 	USERNAME   := $(subst $(SPACE),_,$(USERNAME))
 	USERNAME   := $(subst -,_,$(USERNAME))
 	DEFINES    += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME)
-	DLLFLAGS   += -DEBUG -DEBUGTYPE:CV -OUT:"$@"
+	DLLFLAGS   += -DEBUG -OUT:"$@"
 	# Purify requires /FIXED:NO when linking EXEs.
-	LDFLAGS    += -DEBUG -DEBUGTYPE:CV -PDB:NONE /FIXED:NO
+	LDFLAGS    += -DEBUG -PDB:NONE /FIXED:NO
     endif
 endif # NS_USE_GCC
 
diff --git a/security/coreconf/WIN954.0.mk b/security/coreconf/WIN954.0.mk
index e710f6e2e..13aa6519c 100644
--- a/security/coreconf/WIN954.0.mk
+++ b/security/coreconf/WIN954.0.mk
@@ -58,6 +58,9 @@ else
 endif
 
 ifndef NS_USE_GCC
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+	OS_DLLFLAGS += -PDB:NONE
+endif
 endif
 DEFINES += -DWIN95
diff --git a/security/coreconf/WINCE3.0.mk b/security/coreconf/WINCE3.0.mk
index ddf7a4c7b..375cb4a5a 100644
--- a/security/coreconf/WINCE3.0.mk
+++ b/security/coreconf/WINCE3.0.mk
@@ -65,7 +65,7 @@ OS_CFLAGS += -W3 -nologo
 
 OS_DLLFLAGS += -DLL 
 
-LINKFLAGS = -nologo -PDB:NONE -subsystem:windowsce,3.00 \
+LINKFLAGS = -nologo -subsystem:windowsce,3.00 \
  -nodefaultlib:libc.lib \
  -nodefaultlib:libcd.lib \
  -nodefaultlib:libcmt.lib \
@@ -75,6 +75,10 @@ LINKFLAGS = -nologo -PDB:NONE -subsystem:windowsce,3.00 \
  -nodefaultlib:oldnames.lib \
  $(NULL)
 
+ifndef MOZ_DEBUG_SYMBOLS
+    LINKFLAGS += -PDB:NONE
+endif
+
 LINK    += $(LINKFLAGS)
 LDFLAGS += $(LINKFLAGS)
 
diff --git a/security/coreconf/WINNT3.51.mk b/security/coreconf/WINNT3.51.mk
index b422b2b56..42a268ed4 100644
--- a/security/coreconf/WINNT3.51.mk
+++ b/security/coreconf/WINNT3.51.mk
@@ -55,8 +55,11 @@ endif
 
 OS_WIN_CFLAGS += -W3
 OS_CFLAGS     += -nologo $(OS_WIN_CFLAGS) $(OS_PROC_CFLAGS)
-#OS_DLLFLAGS  += -nologo -DLL -PDB:NONE -SUBSYSTEM:WINDOWS
-OS_DLLFLAGS   += -nologo -DLL -PDB:NONE -SUBSYSTEM:WINDOWS
+OS_DLLFLAGS   += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+	OS_DLLFLAGS   += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #
diff --git a/security/coreconf/WINNT4.0.mk b/security/coreconf/WINNT4.0.mk
index 7fc5a54d6..d15f547ee 100644
--- a/security/coreconf/WINNT4.0.mk
+++ b/security/coreconf/WINNT4.0.mk
@@ -55,7 +55,11 @@ else
 	endif
 endif
 
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+	OS_DLLFLAGS += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #
diff --git a/security/coreconf/WINNT5.0.mk b/security/coreconf/WINNT5.0.mk
index 303b98007..81cd668ed 100644
--- a/security/coreconf/WINNT5.0.mk
+++ b/security/coreconf/WINNT5.0.mk
@@ -55,7 +55,11 @@ else
 	endif
 endif
 
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+	OS_DLLFLAGS += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #
diff --git a/security/coreconf/WINNT5.1.mk b/security/coreconf/WINNT5.1.mk
index f9c7ed1c8..90b063a29 100644
--- a/security/coreconf/WINNT5.1.mk
+++ b/security/coreconf/WINNT5.1.mk
@@ -55,7 +55,11 @@ else
 	endif
 endif
 
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+	OS_DLLFLAGS += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #
diff --git a/security/nss/lib/certdb/certdb.c b/security/nss/lib/certdb/certdb.c
index 33c243334..d9cd18449 100644
--- a/security/nss/lib/certdb/certdb.c
+++ b/security/nss/lib/certdb/certdb.c
@@ -1140,6 +1140,7 @@ CERT_KeyUsageAndTypeForCertUsage(SECCertUsage usage,
 	    requiredCertType = NS_CERT_TYPE_OBJECT_SIGNING_CA;
 	    break;
 	  case certUsageAnyCA:
+	  case certUsageVerifyCA:
 	  case certUsageStatusResponder:
 	    requiredKeyUsage = KU_KEY_CERT_SIGN;
 	    requiredCertType = NS_CERT_TYPE_OBJECT_SIGNING_CA |
diff --git a/security/nss/pkg/solaris/SUNWtlsux/Makefile b/security/nss/pkg/solaris/SUNWtlsux/Makefile
deleted file mode 100755
index a8aefbac1..000000000
--- a/security/nss/pkg/solaris/SUNWtlsux/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"$Id$"
-#
-
-CORE_DEPTH = ../../../..
-include ../Makefile-tlsu.com
-
-DATAFILES +=
-
-all:: $(FILES)
-publish:: all pkg
-
-include ../Makefile-tlsu.targ
diff --git a/security/nss/pkg/solaris/SUNWtlsux/pkgdepend b/security/nss/pkg/solaris/SUNWtlsux/pkgdepend
deleted file mode 100755
index ae1bf71a6..000000000
--- a/security/nss/pkg/solaris/SUNWtlsux/pkgdepend
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2002 Microsystems, Inc.  All Rights Reserved.
-# Use is subject to license terms.
-#
-#	$Id$
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-
-P SUNWtlsx	Netscape Security Services (64-bit)
diff --git a/security/nss/pkg/solaris/SUNWtlsux/pkginfo.tmpl b/security/nss/pkg/solaris/SUNWtlsux/pkginfo.tmpl
deleted file mode 100755
index 8aa70615d..000000000
--- a/security/nss/pkg/solaris/SUNWtlsux/pkginfo.tmpl
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"$Id$"
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWtlsux"
-NAME="Network Security Services Utilities (64-bit)"
-ARCH="ISA"
-SUNW_ISA="sparcv9"
-VERSION="NSSVERS,REV=0.0.0"
-SUNW_PRODNAME="Network Security Services Utilities (64-bit)"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Network Security Services Utilities Programs (64-bit)"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
diff --git a/security/nss/pkg/solaris/SUNWtlsux/prototype b/security/nss/pkg/solaris/SUNWtlsux/prototype
deleted file mode 100755
index 29e2ccabf..000000000
--- a/security/nss/pkg/solaris/SUNWtlsux/prototype
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"$Id$"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i copyright
-i pkginfo
-i depend=pkgdepend
-#
-# source locations relative to the prototype file
-#
-# SUNWtlsux
-#
-d none usr 0755 root sys
-d none usr/sfw 0755 root bin
-d none usr/sfw/bin 0755 root bin
-s none usr/sfw/bin/64=sparcv9
-d none usr/sfw/bin/sparcv9 0755 root bin
-f none usr/sfw/bin/sparcv9/certutil 0755 root bin
-f none usr/sfw/bin/sparcv9/crlutil 0755 root bin
-f none usr/sfw/bin/sparcv9/cmsutil 0755 root bin
-f none usr/sfw/bin/sparcv9/modutil 0755 root bin
-f none usr/sfw/bin/sparcv9/pk12util 0755 root bin
-f none usr/sfw/bin/sparcv9/signtool 0755 root bin
-f none usr/sfw/bin/sparcv9/signver 0755 root bin
-f none usr/sfw/bin/sparcv9/ssltap 0755 root bin
diff --git a/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc b/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc
index 4022986a4..1f15d804b 100644
--- a/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc
+++ b/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc
@@ -29,18 +29,10 @@
 # SUNWtlsx
 #
 s none usr/lib/mps/64=sparcv9
-s none usr/lib/mps/secv1/64=sparcv9
 d none usr/lib/mps/sparcv9 755 root bin
-d none usr/lib/mps/secv1/sparcv9 755 root bin
 f none usr/lib/mps/sparcv9/libnss3.so 755 root bin
 f none usr/lib/mps/sparcv9/libsmime3.so 755 root bin
 f none usr/lib/mps/sparcv9/libssl3.so 755 root bin
 f none usr/lib/mps/sparcv9/libnssckbi.so 755 root bin
 f none usr/lib/mps/sparcv9/libsoftokn3.chk 755 root bin
 f none usr/lib/mps/sparcv9/libsoftokn3.so 755 root bin
-s none usr/lib/mps/secv1/sparcv9/libnss3.so=../../libnss3.so
-s none usr/lib/mps/secv1/sparcv9/libsmime3.so=../../libsmime3.so
-s none usr/lib/mps/secv1/sparcv9/libssl3.so=../../libssl3.so
-s none usr/lib/mps/secv1/sparcv9/libnssckbi.so=../../libnssckbi.so
-s none usr/lib/mps/secv1/sparcv9/libsoftokn3.chk=../../libsoftokn3.chk
-s none usr/lib/mps/secv1/sparcv9/libsoftokn3.so=../../libsoftokn3.so