diff --git a/security/psm/Makefile b/security/psm/Makefile
deleted file mode 100755
index 8cb579130c9d..000000000000
--- a/security/psm/Makefile
+++ /dev/null
@@ -1,88 +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).                              #
-#######################################################################
-
-psm_RelEng_srvr_bld:
-	cd ../coreconf; $(MAKE)
-	cd ../../nsprpub; $(MAKE) OBJDIR_NAME=$(OBJDIR_NAME)
-	cd ../nss; $(MAKE) import IMPORTS=dbm/DBM_1_54
-	cd ../nss; $(MAKE)
-ifeq ($(OS_ARCH), WINNT)
-	$(MAKE) import IMPORTS=nlslayer/m16
-else
-	$(MAKE) import IMPORTS=nlslayer/PR3 RELEASE_TREE=/h/tortoise/export/share/builds/components
-endif
-	cd ui; $(MAKE)
-	$(MAKE)
-	cd server; $(MAKE) build_xpi
-
diff --git a/security/psm/Makefile.in b/security/psm/Makefile.in
deleted file mode 100644
index 5993026f1384..000000000000
--- a/security/psm/Makefile.in
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-
-CORE_DEPTH=$(topsrcdir)/security
-
-include $(CORE_DEPTH)/coreconf/arch.mk
-ifeq (,$(filter-out FreeBSD NetBSD OS2,$(OS_TARGET)))
-include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
-else
-include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
-endif
-include $(CORE_DEPTH)/coreconf/prefix.mk
-ifeq ($(OS_ARCH),OS2)
-CPU_TAG = _$(CC)
-else
-CPU_TAG = _$(CPU_ARCH)
-endif
-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
-CORECONF_OBJDIR=$(OBJDIR_NAME)
-
-include $(DEPTH)/config/autoconf.mk
-
-ifndef MOZ_DEBUG
-OPT_GMAKE_FLAGS = BUILD_OPT=1
-BUILD_OPT=1
-OBJDIR_TAG=_OPT
-endif
-
-DEFAULT_GMAKE_FLAGS = -f Makefile $(OPT_GMAKE_FLAGS) 
-
-CORECONF_INSTALL     = $(DIST)/$(CORECONF_OBJDIR)
-CORECONF_DIST        = $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR)
-DEFAULT_GMAKE_FLAGS += DIST=$(CORECONF_DIST) 
-DEFAULT_GMAKE_FLAGS += SOURCE_LIB_DIR=$(CORECONF_DIST)/lib
-DEFAULT_GMAKE_FLAGS += SOURCE_BIN_DIR=$(CORECONF_DIST)/bin
-DEFAULT_GMAKE_FLAGS += SOURCE_XP_DIR=$(CORECONF_DIST)
-
-
-DIRS		= lib
-
-include $(topsrcdir)/config/rules.mk
-
-ABS_topsrcdir	:= $(shell cd $(topsrcdir); pwd)
-
-install::
-ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
-	if test ! -d $(MOZ_BUILD_ROOT)/security/nss; then                   \
-		cp -r $(topsrcdir)/security/nss $(MOZ_BUILD_ROOT)/security; \
-	fi;
-	if test ! -d $(MOZ_BUILD_ROOT)/security/coreconf; then              \
-		cp -r $(topsrcdir)/security/coreconf $(MOZ_BUILD_ROOT)/security; \
-	fi;
-	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/server; then            \
-		cp -r $(topsrcdir)/security/psm/server $(MOZ_BUILD_ROOT)/security/psm/server; \
-	fi;
-	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/ui; then        \
-		cp -r $(topsrcdir)/security/psm/ui $(MOZ_BUILD_ROOT)/security/psm/; \
-	fi;
-	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/doc; then       \
-		cp -r $(topsrcdir)/security/psm/doc $(MOZ_BUILD_ROOT)/security/psm/; \
-	fi;
-endif
-	cd $(MOZ_BUILD_ROOT)/security/coreconf; $(MAKE) $(DEFAULT_GMAKE_FLAGS)
-	cd $(MOZ_BUILD_ROOT)/security/nss; $(MAKE) $(DEFAULT_GMAKE_FLAGS) moz_import
-	cd $(MOZ_BUILD_ROOT)/security/nss/lib; $(MAKE) $(DEFAULT_GMAKE_FLAGS)
-	cd $(MOZ_BUILD_ROOT)/security/psm/ui; $(MAKE) $(DEFAULT_GMAKE_FLAGS)
-	cd $(MOZ_BUILD_ROOT)/security/psm/server; $(MAKE) $(DEFAULT_GMAKE_FLAGS)
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psm$(PROG_SUFFIX) $(DIST)/bin
-ifeq ($(OS_ARCH),OS2)
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/04digsgn.gif $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/06pcrypt.gif $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/bannerrn.gif $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/cartbanner.gif $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/cmcjavascriptapi.html $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/contents.htm $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/glossary.htm $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/help.htm $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/next.gif $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/prev.gif $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/psmtest.html $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/doc/release_notes.html $(DIST)/bin/psmdata/doc
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/ui/psm_bin.properties $(DIST)/bin/psmdata/ui
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/ui/psm_doc.properties $(DIST)/bin/psmdata/ui
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/ui/psm_text.properties $(DIST)/bin/psmdata/ui
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata/ui/psm_ui.properties $(DIST)/bin/psmdata/ui
-else
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata $(DIST)/bin
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/start-psm $(DIST)/bin
-endif
-	$(INSTALL) -m 755 $(CORECONF_INSTALL)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-
-clean clobber clobber_all realclean distclean::
-ifeq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
-	cd $(MOZ_BUILD_ROOT)/security/coreconf; $(MAKE) $(DEFAULT_GMAKE_FLAGS) clean
-	cd $(MOZ_BUILD_ROOT)/security/nss; $(MAKE) $(DEFAULT_GMAKE_FLAGS) clean
-	cd $(MOZ_BUILD_ROOT)/security/psm/ui; $(MAKE) $(DEFAULT_GMAKE_FLAGS) clean
-	cd $(MOZ_BUILD_ROOT)/security/psm/server; $(MAKE) $(DEFAULT_GMAKE_FLAGS) clean
-else
-	if test -d $(MOZ_BUILD_ROOT)/security/nss; then \
-		rm -rf $(MOZ_BUILD_ROOT)/security/nss;  \
-	fi;
-	if test -d $(MOZ_BUILD_ROOT)/security/coreconf; then    \
-		rm -rf $(MOZ_BUILD_ROOT)/security/coreconf;     \
-	fi;
-	if test -d $(MOZ_BUILD_ROOT)/security/psm/server; then  \
-		rm -rf $(MOZ_BUILD_ROOT)/security/psm/server;   \
-	fi;
-	if test -d $(MOZ_BUILD_ROOT)/security/psm/ui; then      \
-		rm -rf $(MOZ_BUILD_ROOT)/security/psm/ui;       \
-	fi;
-	if test -d $(MOZ_BUILD_ROOT)/security/psm/doc; then     \
-		rm -rf $(MOZ_BUILD_ROOT)/security/psm/doc;      \
-	fi;
-	if test -d $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR); then      \
-		rm -rf $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR);       \
-	fi;
-endif
diff --git a/security/psm/makefile.win b/security/psm/makefile.win
deleted file mode 100644
index 6dfe66e694d2..000000000000
--- a/security/psm/makefile.win
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.1 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-# 
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-# 
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-#
-# An NMAKE file to set up and adjust NSPR20's build system for
-# Client build.  Client build should invoke NMAKE on this file
-# instead of invoking gmake directly.
-#
-
-DEPTH = ..\..
-include <$(DEPTH)\config\config.mak>
-
-#
-# Backslashes are escape characters to gmake, so flip all backslashes
-# in $(MOZ_TOOLS) to forward slashes and pass that to gmake.
-#
-
-GMAKE = $(MOZ_TOOLS)\bin\gmake.exe
-
-GMAKE_FLAGS = MOZ_TOOLS_FLIPPED=$(MOZ_TOOLS:\=/) PR_CLIENT_BUILD=1 PR_CLIENT_BUILD_WINDOWS=1 OBJDIR_NAME=$(OBJDIR) 
-
-#
-# The Client's debug build uses MSVC's debug runtime library (/MDd).
-#
-
-!ifdef MOZ_DEBUG
-!else
-GMAKE_FLAGS = $(GMAKE_FLAGS) BUILD_OPT=1
-!endif
-
-!if "$(MOZ_BITS)" == "16"
-GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN16
-!else
-
-GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN95
-!ifdef MOZ_DEBUG
-!ifdef MOZ_NO_DEBUG_RTL
-!IF "$(CPU)" == "ALPHA"
-PR_OBJDIR = WIN954.0ALPHA_DBG.OBJ
-!else
-PR_OBJDIR = WIN954.0_DBG.OBJ
-!endif
-!else
-GMAKE_FLAGS = $(GMAKE_FLAGS) USE_DEBUG_RTL=1
-!IF "$(CPU)" == "ALPHA"
-PR_OBJDIR = WIN954.0ALPHA_DBG.OBJD
-!else
-PR_OBJDIR = WIN954.0_DBG.OBJD
-!endif
-!endif
-!else
-!IF "$(CPU)" == "ALPHA"
-PR_OBJDIR = WIN954.0ALPHA_OPT.OBJ
-!else
-PR_OBJDIR = WIN954.0_OPT.OBJ
-!endif
-!endif
-
-!endif
- 
-
-#
-# The rules.  Simply invoke gmake with the same target.
-# The default target is 'all'.  For Win16, set up the
-# environment to use the Watcom compiler, Watcom headers,
-# and Watcom libs.
-#
-
-all:: export libs install
-
-depend::
-
-export libs install clobber clobber_all clean:: 
-!if "$(MOZ_BITS)" == "16"
-	set PATH=%WATCPATH%
-	set INCLUDE=%WATC_INC%
-	set LIB=%WATC_LIB%
-!endif
-	$(GMAKE) $(GMAKE_FLAGS) $@
-!if "$(MOZ_BITS)" == "16"
-	set PATH=%MSVCPATH%
-	set INCLUDE=%MSVC_INC%
-	set LIB=%MSVC_LIB%
-!endif
diff --git a/security/psm/manifest.mn b/security/psm/manifest.mn
deleted file mode 100644
index bcdfe42f9b39..000000000000
--- a/security/psm/manifest.mn
+++ /dev/null
@@ -1,40 +0,0 @@
-# 
-# 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 = ..
-DEPTH      = ../..
-
-RELEASE = security
-
-DIRS = lib ui server
-
-
diff --git a/security/psm/server/crmfres.c b/security/psm/server/crmfres.c
index 6ad0dbc3891a..54fa366f83a1 100644
--- a/security/psm/server/crmfres.c
+++ b/security/psm/server/crmfres.c
@@ -499,7 +499,7 @@ SSMCRMFRequest_SetKeyGenType(SSMCRMFRequest *crmfReq, SSMKeyGenType keyGenType)
     break;
   case dsaSignNonrepudiation:
     rv = SSMCRMFRequest_SetDSASignNonRepudiation(crmfReq);
-    break;
+  yPKIArchiveOptions(archOpt);  break;
   default:
     SSM_DEBUG("Unknown KeyGenType %d\n", keyGenType);
     rv = PR_FAILURE;
diff --git a/security/psm/server/serv.h b/security/psm/server/serv.h
index eadde1eabdb0..62e01f3b1892 100644
--- a/security/psm/server/serv.h
+++ b/security/psm/server/serv.h
@@ -121,7 +121,7 @@ int SSM_strncasecmp(const char *s1, const char *s2, size_t count);
  * #if 0 block a #if 1 block or add a -DPSM_LOG to the compile
  * line.
  */
-#if 0
+#if 1
 #define PSM_LOG 1
 #endif