--- a/dbm/Makefile.in
+++ b/dbm/Makefile.in
@@ -1,53 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= dbm
-DIRS		= include src
-
-ifdef ENABLE_TESTS
-DIRS		+= tests
-endif
-
-include $(topsrcdir)/config/rules.mk
-

--- a/dbm/include/mcom_db.h
+++ b/dbm/include/mcom_db.h
@@ -151,17 +151,17 @@
 
 #ifdef SNI
 /* #include <sys/hetero.h> */
 #define BYTE_ORDER BIG_ENDIAN
 #define BIG_ENDIAN      4321
 #define LITTLE_ENDIAN   1234
 #endif
 
-#if defined(_WINDOWS) || defined(XP_OS2_VACPP)
+#ifdef _WINDOWS
 #ifdef BYTE_ORDER
 #undef BYTE_ORDER
 #endif
 
 #define BYTE_ORDER LITTLE_ENDIAN
 #define LITTLE_ENDIAN   1234            /* LSB first: i386, vax, all NT risc */
 #define BIG_ENDIAN      4321
 #endif
@@ -183,24 +183,16 @@
 #if defined(_WINDOWS) || defined(XP_OS2)
 #include <stdio.h>
 #include <io.h>
 
 #ifndef XP_OS2 
 #define MAXPATHLEN 	1024               
 #endif
 
-#ifdef XP_OS2_VACPP
-#include <os2.h>
-#define	MAXPATHLEN	CCHMAXPATH
-#define	EPERM		EINVAL
-#define	ENOTDIR		EBADPOS
-#define	S_ISDIR(s)	((s) & S_IFDIR)
-#endif
-
 #define	EFTYPE		EINVAL		/* POSIX 1003.1 format errno. */
 
 #ifndef	STDERR_FILENO
 #define	STDIN_FILENO	0		/* ANSI C #defines */
 #define	STDOUT_FILENO	1
 #define	STDERR_FILENO	2
 #endif
 

--- a/dbm/src/h_bigkey.c
+++ b/dbm/src/h_bigkey.c
@@ -51,17 +51,17 @@ static char sccsid[] = "@(#)hash_bigkey.
  *	__big_return
  *	__big_delete
  *	__find_last_page
  * Internal
  *	collect_key
  *	collect_data
  */
 
-#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
+#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
 #include <sys/param.h>
 #endif
 
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

--- a/dbm/src/h_page.c
+++ b/dbm/src/h_page.c
@@ -73,17 +73,17 @@ static char sccsid[] = "@(#)hash_page.c	
 #if defined(_WIN32) || defined(_WINDOWS) 
 #include <io.h>
 #endif
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
+#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
 #include <unistd.h>
 #endif
 
 #include <assert.h>
 
 #include "mcom_db.h"
 #include "hash.h"
 #include "page.h"

--- a/dbm/src/hash.c
+++ b/dbm/src/hash.c
@@ -33,39 +33,39 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
 #endif /* LIBC_SCCS and not lint */
 
 #include "watcomfx.h"
 
-#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
+#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
 #include <sys/param.h>
 #endif
 
 #if !defined(macintosh)
-#ifdef XP_OS2_EMX
+#ifdef XP_OS2
 #include <sys/types.h>
 #endif
 #include <sys/stat.h>
 #endif
 
 #if defined(macintosh)
 #include <unix.h>
 #include <unistd.h>
 #endif
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
+#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
 #include <unistd.h>
 #endif
 #if defined(_WIN32) || defined(_WINDOWS) 
 #include <windows.h>
 #endif
 
 #include <assert.h>
 

--- a/dbm/src/hash_buf.c
+++ b/dbm/src/hash_buf.c
@@ -48,17 +48,17 @@ static char sccsid[] = "@(#)hash_buf.c	8
  * External
  *	__buf_init
  *	__get_buf
  *	__buf_free
  *	__reclaim_buf
  * Internal
  *	newbuf
  */
-#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
+#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
 #include <sys/param.h>
 #endif
 
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

--- a/dbm/src/mktemp.c
+++ b/dbm/src/mktemp.c
@@ -42,24 +42,20 @@ static char sccsid[] = "@(#)mktemp.c	8.1
 #include <sys/stat.h>
 #endif
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
 #include <ctype.h>
 #include "mcom_db.h"
 
-#if !defined(_WINDOWS) && !defined(XP_OS2_VACPP)
+#ifndef _WINDOWS
 #include <unistd.h>
 #endif
 
-#ifdef XP_OS2_VACPP
-#include <process.h>
-#endif
-
 #ifdef _WINDOWS
 #include <process.h>
 #include "winfile.h"
 #endif
 
 static int _gettemp(char *path, register int *doopen, int extraFlags);
 
 int

--- a/dbm/src/snprintf.c
+++ b/dbm/src/snprintf.c
@@ -10,41 +10,40 @@
 #else
 #include "cdefs.h"
 #endif
 
 #include "prtypes.h"
 
 #include <ncompat.h>
 
-/* The OS/2 VAC compiler doesn't appear to define __STDC__ and won't let us define it either */
-#if defined(__STDC__) || defined(XP_OS2_VACPP)
+#ifdef __STDC__
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
 
 int
-#if defined(__STDC__) || defined(XP_OS2_VACPP)
+#ifdef __STDC__
 snprintf(char *str, size_t n, const char *fmt, ...)
 #else
 snprintf(str, n, fmt, va_alist)
 	char *str;
 	size_t n;
 	const char *fmt;
 	va_dcl
 #endif
 {
 	va_list ap;
 #ifdef VSPRINTF_CHARSTAR
 	char *rp;
 #else
 	int rval;
 #endif
-#if defined(__STDC__) || defined(XP_OS2_VACPP)
+#ifdef __STDC__
 	va_start(ap, fmt);
 #else
 	va_start(ap);
 #endif
 #ifdef VSPRINTF_CHARSTAR
 	rp = vsprintf(str, fmt, ap);
 	va_end(ap);
 	return (strlen(rp));

--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@@ -39,16 +39,18 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dbm
 
+PACKAGE_FILE = dbmtest.pkg
+
 PROGRAM		= lots$(BIN_SUFFIX)
 
 CSRCS		= lots.c
 
 ifeq ($(OS_ARCH),WINNT)
 EXTRA_DSO_LIBS	= dbm$(MOZ_BITS)
 else
 EXTRA_DSO_LIBS	= mozdbm_s

new file mode 100644
--- /dev/null
+++ b/dbm/tests/dbmtest.pkg
@@ -0,0 +1,2 @@
+[gecko-tests]
+dist/bin/lots@BINS@

--- a/security/coreconf/WINCE.mk
+++ b/security/coreconf/WINCE.mk
@@ -76,16 +76,17 @@ MKDEPENDENCIES  = $(OBJDIR_NAME)/depend.
 INSTALL      = $(NSINSTALL)
 MAKE_OBJDIR  = mkdir
 MAKE_OBJDIR += $(OBJDIR)
 RC           = rc.exe
 GARBAGE     += $(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb
 XP_DEFINE   += -DXP_PC
 LIB_SUFFIX   = lib
 DLL_SUFFIX   = dll
+OS_DLLFLAGS  += -DLL
 
 ifdef BUILD_OPT
 #   OS_CFLAGS  += -MD
     OPTIMIZER  += -O2
     DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
     DLLFLAGS   += -OUT:"$@"
 else
     #

deleted file mode 100644
--- a/security/coreconf/WINCE3.0.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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 the Initial Developer are Copyright (C) 1994-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# Config stuff for WINCE 3.0 (MS Pocket PC 2002)
-#
-# CPU_ARCH must already be defined to one of:
-#   x86, ARM
-#
-# This makefile defines the following variables:
-# OS_CFLAGS, and OS_DLLFLAGS.
-
-include $(CORE_DEPTH)/coreconf/WINCE.mk
-
-CEVersion  = 300
-CePlatform = WIN32_PLATFORM_PSPC=310
-
-ifeq ($(CPU_ARCH), x86)
-    DEFINES += -D_X86_ -D_i386_ -Di_386_ -Dx86
-    OS_CFLAGS += -Gs8192 -GF
-    OS_DLLFLAGS += -machine:IX86
-else 
-ifeq ($(CPU_ARCH), ARM)
-    DEFINES += -DARM -D_ARM_
-    OS_DLLFLAGS += -machine:ARM
-else 
-    include CPU_ARCH_is_undefined
-endif
-endif
-
-DEFINES += -D_WIN32_WCE=300 -DUNDER_CE=300
-DEFINES += -DWIN32_PLATFORM_PSPC=310
-DEFINES += -DUNICODE -D_UNICODE
-OS_CFLAGS += -W3 -nologo
-
-OS_DLLFLAGS += -DLL 
-
-LINKFLAGS = -nologo -subsystem:windowsce,3.00 \
- -nodefaultlib:libc.lib \
- -nodefaultlib:libcd.lib \
- -nodefaultlib:libcmt.lib \
- -nodefaultlib:libcmtd.lib \
- -nodefaultlib:msvcrt.lib \
- -nodefaultlib:msvcrtd.lib \
- -nodefaultlib:oldnames.lib \
- $(NULL)
-
-ifndef MOZ_DEBUG_SYMBOLS
-    LINKFLAGS += -PDB:NONE
-endif
-
-LINK    += $(LINKFLAGS)
-LDFLAGS += $(LINKFLAGS)
-
-OS_LIBS= coredll.lib corelibc.lib
-
-#DLLBASE = -base:"0x00100000" -stack:0x10000,0x1000 -entry:"_DllMainCRTStartup"
-DLLBASE += -align:"4096"
-
-#SUB_SHLOBJS =
-#EXTRA_LIBS =
-#EXTRA_SHARED_LIBS =
-#OS_LIBS=
-#LD_LIBS=
-
-#
-# Win NT needs -GT so that fibers can work
-#
-#OS_CFLAGS += -GT
-#DEFINES += -DWINNT
-
-# WINNT uses the lib prefix, Win95 and WinCE don't
-NSPR31_LIB_PREFIX = $(NULL)

--- a/security/coreconf/config.mk
+++ b/security/coreconf/config.mk
@@ -58,17 +58,17 @@ endif
 #       (dependent upon <architecture> tags)                          #
 #                                                                     #
 #       We are moving towards just having a $(OS_TARGET).mk file      #
 #       as opposed to multiple $(OS_TARGET)$(OS_RELEASE).mk files,    #
 #       one for each OS release.                                      #
 #######################################################################
 
 TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
-              OpenVMS AIX RISCOS
+              OpenVMS AIX RISCOS WINCE
 
 ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
 include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
 else
 include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
 endif
 
 #######################################################################
@@ -185,16 +185,20 @@ endif
 ifdef NSS_ALLOW_UNSUPPORTED_CRITICAL
 DEFINES += -DNSS_ALLOW_UNSUPPORTED_CRITICAL
 endif
 
 ifdef BUILD_LIBPKIX_TESTS
 DEFINES += -DBUILD_LIBPKIX_TESTS
 endif
 
+ifdef NSS_DISABLE_DBM
+DEFINES += -DNSS_DISABLE_DBM
+endif
+
 # Avoid building object leak test code for optimized library
 ifndef BUILD_OPT
 ifdef PKIX_OBJECT_LEAK_TEST
 DEFINES += -DPKIX_OBJECT_LEAK_TEST
 endif
 endif
 
 # This allows all library and tools code to use the util function

--- a/security/dbm/Makefile
+++ b/security/dbm/Makefile
@@ -37,16 +37,20 @@
 # ***** END LICENSE BLOCK *****
 
 #######################################################################
 # (1) Include initial platform-independent assignments (MANDATORY).   #
 #######################################################################
 
 include manifest.mn
 
+ifdef NSS_DISABLE_DBM
+DIRS	= dummy
+endif
+
 #######################################################################
 # (2) Include "global" configuration information. (OPTIONAL)          #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #

--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -142,17 +142,21 @@ endif
 
 build_nspr: $(NSPR_CONFIG_STATUS)
 	cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE)
 
 clobber_nspr: $(NSPR_CONFIG_STATUS)
 	cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber
 
 build_dbm:
+ifndef NSS_DISABLE_DBM
 	cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs
+else
+	echo "skipping the build of DBM"
+endif
 
 clobber_dbm:
 	cd $(CORE_DEPTH)/dbm ; $(MAKE) clobber
 
 moz_import::
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 	$(NSINSTALL) -D $(DIST)/include/nspr
 	cp $(DIST)/../include/nspr/*.h $(DIST)/include/nspr

--- a/security/nss/cmd/bltest/blapitest.c
+++ b/security/nss/cmd/bltest/blapitest.c
@@ -668,16 +668,18 @@ typedef enum {
     bltestRC2_CBC,	  /* .			   */
     bltestRC4,		  /* .			   */
     bltestRC5_ECB,	  /* .			   */
     bltestRC5_CBC,	  /* .			   */
     bltestAES_ECB,        /* .                     */
     bltestAES_CBC,        /* .                     */
     bltestCAMELLIA_ECB,   /* .                     */
     bltestCAMELLIA_CBC,   /* .                     */
+    bltestSEED_ECB,       /* SEED algorithm	   */
+    bltestSEED_CBC,       /* SEED algorithm	   */
     bltestRSA,		  /* Public Key Ciphers	   */
 #ifdef NSS_ENABLE_ECC
     bltestECDSA,	  /* . (Public Key Sig.)   */
 #endif
     bltestDSA,		  /* .                     */
     bltestMD2,		  /* Hash algorithms	   */
     bltestMD5,		  /* .			   */
     bltestSHA1,           /* .			   */
@@ -697,16 +699,18 @@ static char *mode_strings[] =
     "rc2_cbc",
     "rc4",
     "rc5_ecb",
     "rc5_cbc",
     "aes_ecb",
     "aes_cbc",
     "camellia_ecb",
     "camellia_cbc",
+    "seed_ecb",
+    "seed_cbc",
     "rsa",
 #ifdef NSS_ENABLE_ECC
     "ecdsa",
 #endif
     /*"pqg",*/
     "dsa",
     "md2",
     "md5",
@@ -812,17 +816,17 @@ struct  bltestCipherInfoStr {
     double cxtime;
     double optime;
 };
 
 PRBool
 is_symmkeyCipher(bltestCipherMode mode)
 {
     /* change as needed! */
-    if (mode >= bltestDES_ECB && mode <= bltestCAMELLIA_CBC)
+    if (mode >= bltestDES_ECB && mode <= bltestSEED_CBC)
 	return PR_TRUE;
     return PR_FALSE;
 }
 
 PRBool
 is_pubkeyCipher(bltestCipherMode mode)
 {
     /* change as needed! */
@@ -854,17 +858,18 @@ is_sigCipher(bltestCipherMode mode)
 }
 
 PRBool
 cipher_requires_IV(bltestCipherMode mode)
 {
     /* change as needed! */
     if (mode == bltestDES_CBC || mode == bltestDES_EDE_CBC ||
 	mode == bltestRC2_CBC || mode == bltestRC5_CBC     ||
-        mode == bltestAES_CBC || mode == bltestCAMELLIA_CBC)
+        mode == bltestAES_CBC || mode == bltestCAMELLIA_CBC||
+	mode == bltestSEED_CBC)
 	return PR_TRUE;
     return PR_FALSE;
 }
 
 SECStatus finishIO(bltestIO *output, PRFileDesc *file);
 
 SECStatus
 setupIO(PRArenaPool *arena, bltestIO *input, PRFileDesc *file,
@@ -1109,16 +1114,34 @@ camellia_Decrypt(void *cx, unsigned char
 		 unsigned int inputLen)
 {
     return Camellia_Decrypt((CamelliaContext *)cx, output, outputLen,
 			    maxOutputLen,
 			    input, inputLen);
 }
 
 SECStatus
+seed_Encrypt(void *cx, unsigned char *output, unsigned int *outputLen,
+            unsigned int maxOutputLen, const unsigned char *input,
+            unsigned int inputLen)
+{
+    return SEED_Encrypt((SEEDContext *)cx, output, outputLen, maxOutputLen,
+                       input, inputLen);
+}
+
+SECStatus
+seed_Decrypt(void *cx, unsigned char *output, unsigned int *outputLen,
+            unsigned int maxOutputLen, const unsigned char *input,
+            unsigned int inputLen)
+{
+    return SEED_Decrypt((SEEDContext *)cx, output, outputLen, maxOutputLen,
+                       input, inputLen);
+}
+
+SECStatus
 rsa_PublicKeyOp(void *key, SECItem *output, const SECItem *input)
 {
     return RSA_PublicKeyOp((RSAPublicKey *)key, output->data, input->data);
 }
 
 SECStatus
 rsa_PrivateKeyOp(void *key, SECItem *output, const SECItem *input)
 {
@@ -1372,16 +1395,56 @@ bltest_camellia_init(bltestCipherInfo *c
     if (encrypt)
 	cipherInfo->cipher.symmkeyCipher = camellia_Encrypt;
     else
 	cipherInfo->cipher.symmkeyCipher = camellia_Decrypt;
     return SECSuccess;
 }
 
 SECStatus
+bltest_seed_init(bltestCipherInfo *cipherInfo, PRBool encrypt)
+{
+    PRIntervalTime time1, time2;
+    bltestSymmKeyParams *seedp = &cipherInfo->params.sk;
+    int minorMode;
+    int i;
+
+    switch (cipherInfo->mode) {
+    case bltestSEED_ECB:	minorMode = NSS_SEED;		break;
+    case bltestSEED_CBC:	minorMode = NSS_SEED_CBC;	break;
+    default:
+	return SECFailure;
+    }
+    cipherInfo->cx = (void*)SEED_CreateContext(seedp->key.buf.data,
+					      seedp->iv.buf.data,
+					      minorMode, encrypt);
+    if (cipherInfo->cxreps > 0) {
+	SEEDContext **dummycx;
+	dummycx = PORT_Alloc(cipherInfo->cxreps * sizeof(SEEDContext *));
+	TIMESTART();
+	for (i=0; i<cipherInfo->cxreps; i++) {
+	    dummycx[i] = (void*)SEED_CreateContext(seedp->key.buf.data,
+					          seedp->iv.buf.data,
+					          minorMode, encrypt);
+	}
+	TIMEFINISH(cipherInfo->cxtime, 1.0);
+	for (i=0; i<cipherInfo->cxreps; i++) {
+	    SEED_DestroyContext(dummycx[i], PR_TRUE);
+	}
+	PORT_Free(dummycx);
+    }
+    if (encrypt)
+	cipherInfo->cipher.symmkeyCipher = seed_Encrypt;
+    else
+	cipherInfo->cipher.symmkeyCipher = seed_Decrypt;
+	
+	return SECSuccess;
+}
+
+SECStatus
 bltest_rsa_init(bltestCipherInfo *cipherInfo, PRBool encrypt)
 {
     int i;
     RSAPrivateKey **dummyKey;
     PRIntervalTime time1, time2;
     bltestRSAParams *rsap = &cipherInfo->params.rsa;
     /* RSA key gen was done during parameter setup */
     cipherInfo->cx = cipherInfo->params.rsa.rsakey;
@@ -1931,16 +1994,22 @@ cipherInit(bltestCipherInfo *cipherInfo,
 	return bltest_aes_init(cipherInfo, encrypt);
 	break;
     case bltestCAMELLIA_ECB:
     case bltestCAMELLIA_CBC:
 	SECITEM_AllocItem(cipherInfo->arena, &cipherInfo->output.buf,
 			  cipherInfo->input.pBuf.len);
 	return bltest_camellia_init(cipherInfo, encrypt);
 	break;
+    case bltestSEED_ECB:
+    case bltestSEED_CBC:
+	SECITEM_AllocItem(cipherInfo->arena, &cipherInfo->output.buf,
+			  cipherInfo->input.pBuf.len);
+	return bltest_seed_init(cipherInfo, encrypt);
+	break;
     case bltestRSA:
 	SECITEM_AllocItem(cipherInfo->arena, &cipherInfo->output.buf,
 			  cipherInfo->input.pBuf.len);
 	return bltest_rsa_init(cipherInfo, encrypt);
 	break;
     case bltestDSA:
 	SECITEM_AllocItem(cipherInfo->arena, &cipherInfo->output.buf,
 			  DSA_SIGNATURE_LEN);
@@ -2385,16 +2454,20 @@ cipherFinish(bltestCipherInfo *cipherInf
     case bltestAES_ECB:
     case bltestAES_CBC:
 	AES_DestroyContext((AESContext *)cipherInfo->cx, PR_TRUE);
 	break;
     case bltestCAMELLIA_ECB:
     case bltestCAMELLIA_CBC:
 	Camellia_DestroyContext((CamelliaContext *)cipherInfo->cx, PR_TRUE);
 	break;
+    case bltestSEED_ECB:
+    case bltestSEED_CBC:
+	SEED_DestroyContext((SEEDContext *)cipherInfo->cx, PR_TRUE);
+	break;
     case bltestRC2_ECB:
     case bltestRC2_CBC:
 	RC2_DestroyContext((RC2Context *)cipherInfo->cx, PR_TRUE);
 	break;
     case bltestRC4:
 	RC4_DestroyContext((RC4Context *)cipherInfo->cx, PR_TRUE);
 	break;
 #if NSS_SOFTOKEN_DOES_RC5
@@ -2535,16 +2608,18 @@ print_td:
       case bltestDES_ECB:
       case bltestDES_CBC:
       case bltestDES_EDE_ECB:
       case bltestDES_EDE_CBC:
       case bltestAES_ECB:
       case bltestAES_CBC:
       case bltestCAMELLIA_ECB:
       case bltestCAMELLIA_CBC:
+      case bltestSEED_ECB:
+      case bltestSEED_CBC:
       case bltestRC2_ECB:
       case bltestRC2_CBC:
       case bltestRC4:
           if (td)
               fprintf(stdout, "%8s", "symmkey");
           else
               fprintf(stdout, "%8d", 8*info->params.sk.key.buf.len);
           break;
@@ -2678,24 +2753,26 @@ get_params(PRArenaPool *arena, bltestPar
     int index = 0;
 #endif
     switch (mode) {
     case bltestDES_CBC:
     case bltestDES_EDE_CBC:
     case bltestRC2_CBC:
     case bltestAES_CBC:
     case bltestCAMELLIA_CBC:
+    case bltestSEED_CBC: 
 	sprintf(filename, "%s/tests/%s/%s%d", testdir, modestr, "iv", j);
 	load_file_data(arena, &params->sk.iv, filename, bltestBinary);
     case bltestDES_ECB:
     case bltestDES_EDE_ECB:
     case bltestRC2_ECB:
     case bltestRC4:
     case bltestAES_ECB:
     case bltestCAMELLIA_ECB:
+    case bltestSEED_ECB:
 	sprintf(filename, "%s/tests/%s/%s%d", testdir, modestr, "key", j);
 	load_file_data(arena, &params->sk.key, filename, bltestBinary);
 	break;
 #if NSS_SOFTOKEN_DOES_RC5
     case bltestRC5_ECB:
     case bltestRC5_CBC:
 	sprintf(filename, "%s/tests/%s/%s%d", testdir, modestr, "iv", j);
 	load_file_data(arena, &params->sk.iv, filename, bltestBinary);

new file mode 100644
--- /dev/null
+++ b/security/nss/cmd/bltest/tests/seed_cbc/ciphertext0
@@ -0,0 +1,1 @@
+JVdzim3if1YIcpGABasoCQ==

new file mode 100644
--- /dev/null
+++ b/security/nss/cmd/bltest/tests/seed_cbc/iv0
@@ -0,0 +1,1 @@
+1234567890123456

new file mode 100644
--- /dev/null
+++ b/security/nss/cmd/bltest/tests/seed_cbc/key0
@@ -0,0 +1,1 @@
+fedcba9876543210

new file mode 100644
--- /dev/null
+++ b/security/nss/cmd/bltest/tests/seed_cbc/numtests
@@ -0,0 +1,1 @@
+1

new file mode 100644
--- /dev/null
+++ b/security/nss/cmd/bltest/tests/seed_cbc/plaintext0
@@ -0,0 +1,1 @@
+0123456789abcdef

new file mode 100644
--- /dev/null
+++ b/security/nss/cmd/bltest/tests/seed_ecb/ciphertext0
@@ -0,0 +1,1 @@
+GX8KY3uUhAQnL6XbQhXjEw==

new file mode 100644
--- /dev/null
+++ b/security/nss/cmd/bltest/tests/seed_ecb/iv0
@@ -0,0 +1,1 @@
+1234567890123456

new file mode 100644
--- /dev/null
+++ b/security/nss/cmd/bltest/tests/seed_ecb/key0
@@ -0,0 +1,1 @@
+fedcba9876543210

new file mode 100644
--- /dev/null
+++ b/security/nss/cmd/bltest/tests/seed_ecb/numtests
@@ -0,0 +1,1 @@
+1

new file mode 100644
--- /dev/null
+++ b/security/nss/cmd/bltest/tests/seed_ecb/plaintext0
@@ -0,0 +1,1 @@
+0123456789abcdef

--- a/security/nss/cmd/certutil/certutil.c
+++ b/security/nss/cmd/certutil/certutil.c
@@ -798,17 +798,17 @@ ListKeysInSlot(PK11SlotInfo *slot, const
         keyName = PK11_GetPrivateKeyNickname(node->key);
 	if (!keyName || !keyName[0]) {
 	    /* Try extra hard to find nicknames for keys that lack them. */
 	    CERTCertificate * cert;
 	    PORT_Free((void *)keyName);
 	    keyName = NULL;
 	    cert = PK11_GetCertFromPrivateKey(node->key);
 	    if (cert) {
-		if (cert->nickname && !cert->nickname[0]) {
+		if (cert->nickname && cert->nickname[0]) {
 		    keyName = PORT_Strdup(cert->nickname);
 		} else if (cert->emailAddr && cert->emailAddr[0]) {
 		    keyName = PORT_Strdup(cert->emailAddr);
 		}
 		CERT_DestroyCertificate(cert);
 	    }
 	}
 	if (nickName) {

--- a/security/nss/cmd/pk11mode/pk11mode.c
+++ b/security/nss/cmd/pk11mode/pk11mode.c
@@ -44,16 +44,25 @@
 
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 
+#if defined(XP_UNIX) && !defined(NO_FORK_CHECK)
+#include <unistd.h>
+#include <sys/wait.h>
+#else
+#ifndef NO_FORK_CHECK
+#define NO_FORK_CHECK
+#endif
+#endif
+
 #ifdef _WIN32
 #include <windows.h>
 #define LIB_NAME "softokn3.dll"
 #endif
 #include "prlink.h"
 #include "prprf.h"
 #include "plgetopt.h"
 #include "prenv.h"
@@ -539,16 +548,19 @@ CK_RV PKM_wrapUnwrap(CK_FUNCTION_LIST_PT
                      CK_OBJECT_HANDLE hSecretKey,
                      CK_ATTRIBUTE *sKeyTemplate,
                      CK_ULONG skeyTempSize);
 CK_RV PKM_RecoverFunctions(CK_FUNCTION_LIST_PTR pFunctionList, 
                     CK_SESSION_HANDLE hSession,
                     CK_OBJECT_HANDLE hPubKey, CK_OBJECT_HANDLE hPrivKey,
                     CK_MECHANISM *signMech, const CK_BYTE * pData, 
                     CK_ULONG pDataLen);
+CK_RV PKM_ForkCheck(int expected, CK_FUNCTION_LIST_PTR fList,
+		    PRBool forkAssert, CK_C_INITIALIZE_ARGS_NSS *initArgs);
+
 void  PKM_Help(); 
 void  PKM_CheckPath(char *string);
 char  *PKM_FilePasswd(char *pwFile);
 static PRBool verbose = PR_FALSE;
 
 int main(int argc, char **argv)
 {
     CK_C_GetFunctionList pC_GetFunctionList;
@@ -560,24 +572,28 @@ int main(int argc, char **argv)
     CK_ULONG slotID = 0; /* slotID == 0 for FIPSMODE */
 
     CK_UTF8CHAR *pwd = NULL;
     CK_ULONG pwdLen = 0;
     char *moduleSpec = NULL;
     char *configDir = NULL;
     char *dbPrefix = NULL;
     char *disableUnload = NULL;
+    PRBool doForkTests = PR_TRUE;
 
     PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "nvhf:d:p:");
+    PLOptState *opt = PL_CreateOptState(argc, argv, "nvhf:Fd:p:");
     while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
     {
-        if (PL_OPT_BAD == os) continue;
+       if (PL_OPT_BAD == os) continue;
        switch (opt->option)
         {
+        case 'F':  /* disable fork tests */
+            doForkTests = PR_FALSE;
+            break;
         case 'n':  /* non fips mode */
             MODE = NONFIPSMODE;
             slotID = 1;
             break;
         case 'f':  /* password file */
             pwd = (CK_UTF8CHAR *) PKM_FilePasswd((char *)opt->value);
             if (!pwd) PKM_Help();
             break;
@@ -607,16 +623,26 @@ int main(int argc, char **argv)
     pwdLen = strlen((const char*)pwd); 
     if (!configDir) {
         configDir = strdup(".");
     }
     if (!dbPrefix) {
         dbPrefix = strdup("");
     }
 
+    if (doForkTests)
+    {
+        /* first, try to fork without softoken loaded to make sure
+         * everything is OK */
+        crv = PKM_ForkCheck(123, NULL, PR_FALSE, NULL);
+        if (crv != CKR_OK)
+            goto cleanup;
+    }
+
+
 #ifdef _WIN32
     hModule = LoadLibrary(LIB_NAME);
     if (hModule == NULL) {
         PKM_Error( "cannot load %s\n", LIB_NAME);
         goto cleanup;
     }
     if (MODE == FIPSMODE) {
         /* FIPS mode == FC_GetFunctionList */
@@ -660,16 +686,26 @@ int main(int argc, char **argv)
     } else {
         printf("loaded C_GetFunctionList for NON FIPS MODE; slotID %d \n",
                 (int) slotID);
     }
 
     crv = (*pC_GetFunctionList)(&pFunctionList);
     assert(crv == CKR_OK);
 
+
+    if (doForkTests)
+    {
+        /* now, try to fork with softoken loaded, but not initialized */
+        crv = PKM_ForkCheck(CKR_CRYPTOKI_NOT_INITIALIZED, pFunctionList,
+			    PR_TRUE, NULL);
+        if (crv != CKR_OK)
+            goto cleanup;
+    }
+    
     initArgs.CreateMutex = NULL;
     initArgs.DestroyMutex = NULL;
     initArgs.LockMutex = NULL;
     initArgs.UnlockMutex = NULL;
     initArgs.flags = CKF_OS_LOCKING_OK;
     moduleSpec = PR_smprintf("configdir='%s' certPrefix='%s' "
                              "keyPrefix='%s' secmod='secmod.db' flags= ",
                              configDir, dbPrefix, dbPrefix);
@@ -685,16 +721,31 @@ int main(int argc, char **argv)
     crv = pFunctionList->C_Initialize(&initArgs);
     if (crv == CKR_OK) {
         PKM_LogIt("C_Initialize succeeded\n");
     } else {
         PKM_Error( "C_Initialize failed with 0x%08X, %-26s\n", crv, 
                    PKM_CK_RVtoStr(crv));
         goto cleanup;
     }
+
+    if (doForkTests)
+    {
+        /* Disable core on fork for this test, since we are testing the
+         * pathological case, and if enabled, the child process would dump
+         * core in C_GetTokenInfo .
+         * We can still differentiate the correct from incorrect behavior
+         * by the PKCS#11 return code.
+         */
+        /* try to fork with softoken both loaded and initialized */
+        crv = PKM_ForkCheck(CKR_DEVICE_ERROR, pFunctionList, PR_FALSE, NULL);
+        if (crv != CKR_OK)
+            goto cleanup;
+    }
+
     crv = PKM_ShowInfo(pFunctionList, slotID);
     if (crv == CKR_OK) {
         PKM_LogIt("PKM_ShowInfo succeeded\n");
     } else {
         PKM_Error( "PKM_ShowInfo failed with 0x%08X, %-26s\n", crv, 
                    PKM_CK_RVtoStr(crv));
         goto cleanup;
     }
@@ -863,35 +914,64 @@ int main(int argc, char **argv)
     if (crv == CKR_OK) {
         PKM_LogIt("C_Finalize succeeded\n");
     } else {
         PKM_Error( "C_Finalize failed with 0x%08X, %-26s\n", crv, 
                    PKM_CK_RVtoStr(crv));
         goto cleanup;
     }
 
+    if (doForkTests)
+    {
+        /* try to fork with softoken still loaded, but de-initialized */
+        crv = PKM_ForkCheck(CKR_CRYPTOKI_NOT_INITIALIZED, pFunctionList,
+	                    PR_TRUE, NULL);
+        if (crv != CKR_OK)
+            goto cleanup;
+    }
+
     if (pSlotList) free(pSlotList);
 
-    /* demostrate how an application can be in Hybrid mode */
+    /* demonstrate how an application can be in Hybrid mode */
     /* PKM_HybridMode shows how to switch between NONFIPS */
     /* mode to FIPS mode */
 
     PKM_LogIt("Testing Hybrid mode \n");
     crv = PKM_HybridMode(pwd, pwdLen, &initArgs);
     if (crv == CKR_OK) {
         PKM_LogIt("PKM_HybridMode succeeded\n");
     } else {
         PKM_Error( "PKM_HybridMode failed with 0x%08X, %-26s\n", crv, 
                    PKM_CK_RVtoStr(crv));
         goto cleanup;
     }
 
-    printf("**** Total number of TESTS ran in %s is %d. ****\n", 
-          ((MODE == FIPSMODE) ? "FIPS MODE" : "NON FIPS MODE"), (int) NUMTESTS);    
-    printf("**** ALL TESTS PASSED ****\n");
+    if (doForkTests) {
+        /* testing one more C_Initialize / C_Finalize to exercise getpid()
+         * fork check code */
+        crv = pFunctionList->C_Initialize(&initArgs);
+        if (crv == CKR_OK) {
+            PKM_LogIt("C_Initialize succeeded\n");
+        } else {
+            PKM_Error( "C_Initialize failed with 0x%08X, %-26s\n", crv, 
+                       PKM_CK_RVtoStr(crv));
+            goto cleanup;
+        }
+        crv = pFunctionList->C_Finalize(NULL);
+        if (crv == CKR_OK) {
+            PKM_LogIt("C_Finalize succeeded\n");
+        } else {
+            PKM_Error( "C_Finalize failed with 0x%08X, %-26s\n", crv, 
+                       PKM_CK_RVtoStr(crv));
+            goto cleanup;
+        }
+        /* try to C_Initialize / C_Finalize in child. This should succeed */
+        crv = PKM_ForkCheck(CKR_OK, pFunctionList, PR_TRUE, &initArgs);
+    }
+
     PKM_LogIt("unloading NSS PKCS # 11 softoken and exiting\n");
 
 cleanup:
 
     if (pwd) {
         free(pwd);
     }
     if (configDir) {
@@ -907,16 +987,26 @@ cleanup:
 #ifdef _WIN32
     FreeLibrary(hModule);
 #else
     disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
     if (!disableUnload) {
         PR_UnloadLibrary(lib);
     }
 #endif
+    if (CKR_OK == crv && doForkTests && !disableUnload) {
+        /* try to fork with softoken both de-initialized and unloaded */
+        crv = PKM_ForkCheck(123, NULL, PR_TRUE, NULL);
+    }
+
+    printf("**** Total number of TESTS ran in %s is %d. ****\n", 
+          ((MODE == FIPSMODE) ? "FIPS MODE" : "NON FIPS MODE"), (int) NUMTESTS);    
+    if (CKR_OK == crv) {
+        printf("**** ALL TESTS PASSED ****\n");
+    }
 
     return crv;
 }
 
 /*
 *  PKM_KeyTests
 *
 *
@@ -5310,19 +5400,21 @@ char * PKM_FilePasswd(char *pwFile)
     return (char*) strdup((char*)phrase);
 }
 
 void PKM_Help() 
 {
     PRFileDesc *debug_out = PR_GetSpecialFD(PR_StandardError);
     PR_fprintf(debug_out, "pk11mode test program usage:\n");
     PR_fprintf(debug_out, "\t-f <file>   Password File : echo pw > file \n");
+    PR_fprintf(debug_out, "\t-F          Disable Unix fork tests\n");
     PR_fprintf(debug_out, "\t-n          Non Fips Mode \n");
     PR_fprintf(debug_out, "\t-d <path>   Database path location\n");
     PR_fprintf(debug_out, "\t-p <prefix> DataBase prefix\n");
+    PR_fprintf(debug_out, "\t-v          verbose\n");
     PR_fprintf(debug_out, "\t-h          this help message\n");
     exit(1);
 }
 
 void PKM_CheckPath(char *string)
 {
    char *src;
    char *dest;
@@ -5337,8 +5429,74 @@ void PKM_CheckPath(char *string)
        }
    }
    dest--;
    /* if the last char is a / set it to 0 */
    if (*dest == '/')
        *dest = 0;
 
 }
+
+CK_RV PKM_ForkCheck(int expected, CK_FUNCTION_LIST_PTR fList,
+		    PRBool forkAssert, CK_C_INITIALIZE_ARGS_NSS *initArgs)
+{
+    CK_RV crv = CKR_OK;
+#ifndef NO_FORK_CHECK
+    int rc = -1;
+    int retStatus = 0;
+    NUMTESTS++; /* increment NUMTESTS */
+    if (forkAssert) {
+	putenv("NSS_STRICT_NOFORK=1");
+    } else {
+	putenv("NSS_STRICT_NOFORK=0");
+    }
+    pid_t child = fork();
+    switch (child) {
+    case -1:
+        PKM_Error("Fork failed.\n");
+        crv = CKR_DEVICE_ERROR;
+        break;
+    case 0:
+        if (fList) {
+            if (!initArgs) {
+                /* If softoken is loaded, make a PKCS#11 call to C_GetTokenInfo
+                 * in the child. This call should always fail.
+                 * If softoken is uninitialized,
+                 * it fails with CKR_CRYPTOKI_NOT_INITIALIZED.
+                 * If it was initialized in the parent, the fork check should
+                 * kick in, and make it return CKR_DEVICE_ERROR.
+                 */
+                CK_RV child_crv = fList->C_GetTokenInfo(NULL, NULL);
+                exit(child_crv & 255);
+            } else {
+                /* If softoken is loaded, make a PKCS#11 call to C_Initialize
+                 * in the child. This call should always fail.
+                 * If softoken is uninitialized, this should succeed.
+                 * If it was initialized in the parent, the fork check should
+                 * kick in, and make it return CKR_DEVICE_ERROR.
+                 */
+                CK_RV child_crv = fList->C_Initialize(initArgs);
+                if (CKR_OK == child_crv) {
+                    child_crv = fList->C_Finalize(NULL);
+                }
+                exit(child_crv & 255);
+            }
+        }
+        exit(expected & 255);
+    default:
+        PKM_LogIt("Fork succeeded.\n");
+        pid_t ret = wait(&rc);
+        if (ret != child || (!WIFEXITED(rc)) ||
+            ( (expected & 255) != (WEXITSTATUS(rc) & 255)) ) {
+            int retstatus = -1;
+            if (WIFEXITED(rc)) {
+                retStatus = WEXITSTATUS(rc);
+            }
+            PKM_Error("Child misbehaved.\n");
+            printf("Child return status : %d.\n", retStatus & 255);
+            crv = CKR_DEVICE_ERROR;
+        }
+        break;
+    }
+#endif
+    return crv;
+}
+

--- a/security/nss/cmd/platlibs.mk
+++ b/security/nss/cmd/platlibs.mk
@@ -69,16 +69,22 @@ EXTRA_SHARED_LIBS += \
 else
 EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
 endif
 endif
 endif
 
 SQLITE=-lsqlite3
 
+ifdef NSS_DISABLE_DBM
+DBMLIB = $(NULL)
+else
+DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) 
+endif
+
 ifdef USE_STATIC_LIBS
 
 # can't do this in manifest.mn because OS_ARCH isn't defined there.
 ifeq ($(OS_ARCH), WINNT)
 
 DEFINES += -DNSS_USE_STATIC_LIBS
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
@@ -112,23 +118,23 @@ EXTRA_LIBS += \
 	$(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 	$(CRYPTOLIB) \
-	$(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
 	$(PKIXLIB) \
-	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
+	$(DBMLIB) \
 	$(DIST)/lib/$(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
 	$(NULL)
 
 # $(PROGRAM) has NO explicit dependencies on $(OS_LIBS)
 #OS_LIBS += \
 	wsock32.lib \
@@ -175,33 +181,33 @@ EXTRA_LIBS += \
 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
 	$(CRYPTOLIB) \
-	$(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
+	$(DBMLIB) \
 	$(PKIXLIB) \
 	$(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifeq ($(OS_ARCH), AIX) 
 EXTRA_SHARED_LIBS += -brtl 
 endif
 
 # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
 # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
 	$(SQLITE) \
+	-lnssutil3 \
 	-L$(NSPR_LIB_DIR) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
 	$(NULL)
 endif
 
 ifeq ($(OS_TARGET), SunOS)

--- a/security/nss/cmd/shlibsign/Makefile
+++ b/security/nss/cmd/shlibsign/Makefile
@@ -51,17 +51,35 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include ../platlibs.mk
+ifeq ($(OS_ARCH), WINNT)
+
+EXTRA_LIBS += \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
+	$(NULL)
+
+else
+
+EXTRA_SHARED_LIBS += \
+	-L$(NSPR_LIB_DIR) \
+	-lplc4 \
+	-lplds4 \
+	-lnspr4 \
+	$(NULL)
+
+endif
+
 
 # sign any and all shared libraries that contain the word freebl
 
 CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX)
 CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX))
 CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
 
 MD_LIB_RELEASE_FILES = $(CHECKLOC)

--- a/security/nss/cmd/shlibsign/mangle/Makefile
+++ b/security/nss/cmd/shlibsign/mangle/Makefile
@@ -51,17 +51,35 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include ../../platlibs.mk
+ifeq ($(OS_ARCH), WINNT)
+
+EXTRA_LIBS += \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
+	$(NULL)
+
+else
+
+EXTRA_SHARED_LIBS += \
+	-L$(NSPR_LIB_DIR) \
+	-lplc4 \
+	-lplds4 \
+	-lnspr4 \
+	$(NULL)
+
+endif
+
 
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 

--- a/security/nss/cmd/shlibsign/shlibsign.c
+++ b/security/nss/cmd/shlibsign/shlibsign.c
@@ -30,109 +30,167 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 /*
- * Test program for SDR (Secret Decoder Ring) functions.
+ * shlibsign creates the checksum (.chk) files for the NSS libraries,
+ * libsoftokn3/softokn3 and libfreebl/freebl (platforms can have 
+ * multiple freebl variants), that contain the NSS cryptograhic boundary.
  *
- * $Id: shlibsign.c,v 1.17 2008/09/30 04:32:43 nelson%bolyard.com Exp $
+ * The generated .chk files must be put in the same directory as
+ * the NSS libraries they were generated for.
+ *
+ * When in FIPS 140 mode, the NSS Internal FIPS PKCS #11 Module will
+ * compute the checksum for the NSS cryptographic boundary libraries
+ * and compare the checksum with the value in .chk file.
+ *
+ * $Id: shlibsign.c,v 1.18 2008/11/20 15:44:12 glen.beasley%sun.com Exp $
  */
 
 #ifdef XP_UNIX
 #define USES_LINKS 1
 #endif
 
-#include "nspr.h"
+#include <assert.h>
 #include <stdio.h>
-#include "nss.h"
-#include "secutil.h"
-#include "cert.h"
-#include "pk11func.h"
-
-#include "plgetopt.h"
-#include "pk11sdr.h"
-#include "shsign.h"
-#include "pk11pqg.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
 
 #ifdef USES_LINKS
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #endif
 
-static void
-usage (char *program_name)
-{
-    PRFileDesc *pr_stderr;
+/* nspr headers */
+#include "prlink.h"
+#include "prprf.h"
+#include "prenv.h"
+#include "plgetopt.h"
+#include "prinit.h"
+#include "prmem.h"
+#include "plstr.h"
+#include "prerror.h"
+
+/* softoken headers */
+#include "pkcs11.h"
+#include "pkcs11t.h"
+
+/* freebl headers */
+#include "shsign.h"
 
-    pr_stderr = PR_STDERR;
-    PR_fprintf (pr_stderr,
-      "Usage:%s [-v] [-o outfile] [-d dbdir] [-f pwfile] [-p pwd]\n"
-      "      -i shared_library_name\n", program_name);
+#define NUM_ELEM(array) (sizeof(array)/sizeof(array[0]))
+CK_BBOOL true = CK_TRUE;
+CK_BBOOL false = CK_FALSE;
+static PRBool verbose = PR_FALSE;
+
+static void
+usage (const char *program_name)
+{
+    PRFileDesc *debug_out = PR_GetSpecialFD(PR_StandardError);
+    PR_fprintf (debug_out,
+                "type %s -H for more detail information.\n", program_name);
+    PR_fprintf (debug_out,
+                "Usage: %s [-v] [-V] [-o outfile] [-d dbdir] [-f pwfile]\n"
+                "          [-F] [-p pwd] -[P dbprefix ] "
+                "-i shared_library_name\n",
+                program_name);
+    exit(1);
 }
 
-static char *
+static void 
+long_usage(const char *program_name) 
+{
+    PRFileDesc *debug_out = PR_GetSpecialFD(PR_StandardError);
+    PR_fprintf(debug_out, "%s test program usage:\n", program_name);
+    PR_fprintf(debug_out, "\t-i <infile>  shared_library_name to process\n");
+    PR_fprintf(debug_out, "\t-o <outfile> checksum outfile\n");
+    PR_fprintf(debug_out, "\t-d <path>    database path location\n");
+    PR_fprintf(debug_out, "\t-P <prefix>  database prefix\n");
+    PR_fprintf(debug_out, "\t-f <file>    password File : echo pw > file \n");
+    PR_fprintf(debug_out, "\t-F           FIPS mode\n"); 
+    PR_fprintf(debug_out, "\t-p <pwd>     password\n");
+    PR_fprintf(debug_out, "\t-v           verbose output\n");
+    PR_fprintf(debug_out, "\t-V           perform Verify operations\n");
+    PR_fprintf(debug_out, "\t-?           short help message\n");
+    PR_fprintf(debug_out, "\t-h           short help message\n");
+    PR_fprintf(debug_out, "\t-H           this help message\n");
+    PR_fprintf(debug_out, "\n\n\tNote: Use of FIPS mode requires your ");
+    PR_fprintf(debug_out, "library path is using \n");
+    PR_fprintf(debug_out, "\t      pre-existing libraries with generated ");
+    PR_fprintf(debug_out, "checksum files\n");
+    PR_fprintf(debug_out, "\t      and database in FIPS mode \n");
+    exit(1);
+}
+
+static char * 
 mkoutput(const char *input)
 {
-    int in_len = PORT_Strlen(input);
-    char *output = PORT_Alloc(in_len+sizeof(SGN_SUFFIX));
+    int in_len = strlen(input);
+    char *output = PR_Malloc(in_len+sizeof(SGN_SUFFIX));
     int index = in_len + 1 - sizeof("."SHLIB_SUFFIX);
 
     if ((index > 0) && 
-	(PORT_Strncmp(&input[index],
-			"."SHLIB_SUFFIX,sizeof("."SHLIB_SUFFIX)) == 0)) {
-	in_len = index;
+        (PL_strncmp(&input[index],
+                 "."SHLIB_SUFFIX,sizeof("."SHLIB_SUFFIX)) == 0)) {
+        in_len = index;
     }
-    PORT_Memcpy(output,input,in_len);
-    PORT_Memcpy(&output[in_len],SGN_SUFFIX,sizeof(SGN_SUFFIX));
+    memcpy(output,input,in_len);
+    memcpy(&output[in_len],SGN_SUFFIX,sizeof(SGN_SUFFIX));
     return output;
 }
 
+static void 
+lperror(const char *string) {
+    PRErrorCode errorcode;
 
-static void
-lperror(const char *string)
-{
-     int errNum = PORT_GetError();
-     const char *error = SECU_Strerror(errNum);
-     fprintf(stderr,"%s: %s\n",string, error);
+    errorcode = PR_GetError();
+    PR_fprintf(PR_STDERR, "%s: %d: %s\n", string, errorcode,
+                PR_ErrorToString(errorcode, PR_LANGUAGE_I_DEFAULT));
 }
 
 static void
 encodeInt(unsigned char *buf, int val)
 {
     buf[3] = (val >> 0) & 0xff;
     buf[2] = (val >>  8) & 0xff;
     buf[1] = (val >> 16) & 0xff;
     buf[0] = (val >> 24) & 0xff;
     return;
 }
 
-static SECStatus 
-writeItem(PRFileDesc *fd, SECItem *item, char *file)
+static PRStatus 
+writeItem(PRFileDesc *fd, CK_VOID_PTR pValue,
+          CK_ULONG ulValueLen, char *file)
 {
     unsigned char buf[4];
     int bytesWritten;
+    if (ulValueLen == 0) {
+        PR_fprintf(PR_STDERR, "call to writeItem with 0 bytes of data.\n");
+        return PR_FAILURE;
+    }
 
-    encodeInt(buf,item->len);
+    encodeInt(buf,ulValueLen);
     bytesWritten = PR_Write(fd,buf, 4);
     if (bytesWritten != 4) {
-	lperror(file);
-	return SECFailure;
+        lperror(file);
+        return PR_FAILURE;
     }
-    bytesWritten = PR_Write(fd, item->data, item->len);
-    if (bytesWritten != item->len) {
-	lperror(file);
-	return SECFailure;
+    bytesWritten = PR_Write(fd, pValue, ulValueLen);
+    if (bytesWritten != ulValueLen) {
+        lperror(file);
+        return PR_FAILURE;
     }
-    return SECSuccess;
+    return PR_SUCCESS;
 }
 
 static const unsigned char prime[] = { 0x00,
    0x97, 0x44, 0x1d, 0xcc, 0x0d, 0x39, 0x0d, 0x8d, 
    0xcb, 0x75, 0xdc, 0x24, 0x25, 0x6f, 0x01, 0x92, 
    0xa1, 0x11, 0x07, 0x6b, 0x70, 0xac, 0x73, 0xd7, 
    0x82, 0x28, 0xdf, 0xab, 0x82, 0x0c, 0x41, 0x0c, 
    0x95, 0xb3, 0x3c, 0x3d, 0xea, 0x8a, 0xe6, 0x44, 
@@ -202,335 +260,864 @@ static const unsigned char seed[] = { 0x
     0x33, 0x46, 0x82, 0xec, 0xd6, 0x94, 0x77, 0xc3, 
     0x4f, 0x4c, 0x58, 0x1c, 0x7f, 0x61, 0x3c, 0x36, 
     0xd5, 0x2f, 0xa5, 0x66, 0xd8, 0x2f, 0xce, 0x6e, 
     0x8e, 0x20, 0x48, 0x4a, 0xbb, 0xe3, 0xe0, 0xb2, 
     0x50, 0x33, 0x63, 0x8a, 0x5b, 0x2d, 0x6a, 0xbe, 
     0x4c, 0x28, 0x81, 0x53, 0x5b, 0xe4, 0xf6, 0xfc, 
     0x64, 0x06, 0x13, 0x51, 0xeb, 0x4a, 0x91, 0x9c };
 
-#define MK_SECITEM(bb) { siBuffer, (unsigned char *)(bb), sizeof(bb) }
+static const unsigned int counter=1496;
 
-static PQGParams pqgParams = {
-    NULL,                   /* arena */
-    MK_SECITEM(prime),      /* P     */
-    MK_SECITEM(subprime),   /* Q     */
-    MK_SECITEM(base)        /* G     */
+struct tuple_str {
+    CK_RV         errNum;
+    const char * errString;
 };
 
-static PQGVerify pqgVerify = {
-    NULL,              /* arena   */
-    1496,              /* counter */
-    MK_SECITEM(seed),  /* seed    */
-    MK_SECITEM(h)      /* h       */
+typedef struct tuple_str tuple_str;
+
+static const tuple_str errStrings[] = {
+{CKR_OK                              , "CKR_OK                              "},
+{CKR_CANCEL                          , "CKR_CANCEL                          "},
+{CKR_HOST_MEMORY                     , "CKR_HOST_MEMORY                     "},
+{CKR_SLOT_ID_INVALID                 , "CKR_SLOT_ID_INVALID                 "},
+{CKR_GENERAL_ERROR                   , "CKR_GENERAL_ERROR                   "},
+{CKR_FUNCTION_FAILED                 , "CKR_FUNCTION_FAILED                 "},
+{CKR_ARGUMENTS_BAD                   , "CKR_ARGUMENTS_BAD                   "},
+{CKR_NO_EVENT                        , "CKR_NO_EVENT                        "},
+{CKR_NEED_TO_CREATE_THREADS          , "CKR_NEED_TO_CREATE_THREADS          "},
+{CKR_CANT_LOCK                       , "CKR_CANT_LOCK                       "},
+{CKR_ATTRIBUTE_READ_ONLY             , "CKR_ATTRIBUTE_READ_ONLY             "},
+{CKR_ATTRIBUTE_SENSITIVE             , "CKR_ATTRIBUTE_SENSITIVE             "},
+{CKR_ATTRIBUTE_TYPE_INVALID          , "CKR_ATTRIBUTE_TYPE_INVALID          "},
+{CKR_ATTRIBUTE_VALUE_INVALID         , "CKR_ATTRIBUTE_VALUE_INVALID         "},
+{CKR_DATA_INVALID                    , "CKR_DATA_INVALID                    "},
+{CKR_DATA_LEN_RANGE                  , "CKR_DATA_LEN_RANGE                  "},
+{CKR_DEVICE_ERROR                    , "CKR_DEVICE_ERROR                    "},
+{CKR_DEVICE_MEMORY                   , "CKR_DEVICE_MEMORY                   "},
+{CKR_DEVICE_REMOVED                  , "CKR_DEVICE_REMOVED                  "},
+{CKR_ENCRYPTED_DATA_INVALID          , "CKR_ENCRYPTED_DATA_INVALID          "},
+{CKR_ENCRYPTED_DATA_LEN_RANGE        , "CKR_ENCRYPTED_DATA_LEN_RANGE        "},
+{CKR_FUNCTION_CANCELED               , "CKR_FUNCTION_CANCELED               "},
+{CKR_FUNCTION_NOT_PARALLEL           , "CKR_FUNCTION_NOT_PARALLEL           "},
+{CKR_FUNCTION_NOT_SUPPORTED          , "CKR_FUNCTION_NOT_SUPPORTED          "},
+{CKR_KEY_HANDLE_INVALID              , "CKR_KEY_HANDLE_INVALID              "},
+{CKR_KEY_SIZE_RANGE                  , "CKR_KEY_SIZE_RANGE                  "},
+{CKR_KEY_TYPE_INCONSISTENT           , "CKR_KEY_TYPE_INCONSISTENT           "},
+{CKR_KEY_NOT_NEEDED                  , "CKR_KEY_NOT_NEEDED                  "},
+{CKR_KEY_CHANGED                     , "CKR_KEY_CHANGED                     "},
+{CKR_KEY_NEEDED                      , "CKR_KEY_NEEDED                      "},
+{CKR_KEY_INDIGESTIBLE                , "CKR_KEY_INDIGESTIBLE                "},
+{CKR_KEY_FUNCTION_NOT_PERMITTED      , "CKR_KEY_FUNCTION_NOT_PERMITTED      "},
+{CKR_KEY_NOT_WRAPPABLE               , "CKR_KEY_NOT_WRAPPABLE               "},
+{CKR_KEY_UNEXTRACTABLE               , "CKR_KEY_UNEXTRACTABLE               "},
+{CKR_MECHANISM_INVALID               , "CKR_MECHANISM_INVALID               "},
+{CKR_MECHANISM_PARAM_INVALID         , "CKR_MECHANISM_PARAM_INVALID         "},
+{CKR_OBJECT_HANDLE_INVALID           , "CKR_OBJECT_HANDLE_INVALID           "},
+{CKR_OPERATION_ACTIVE                , "CKR_OPERATION_ACTIVE                "},
+{CKR_OPERATION_NOT_INITIALIZED       , "CKR_OPERATION_NOT_INITIALIZED       "},
+{CKR_PIN_INCORRECT                   , "CKR_PIN_INCORRECT                   "},
+{CKR_PIN_INVALID                     , "CKR_PIN_INVALID                     "},
+{CKR_PIN_LEN_RANGE                   , "CKR_PIN_LEN_RANGE                   "},
+{CKR_PIN_EXPIRED                     , "CKR_PIN_EXPIRED                     "},
+{CKR_PIN_LOCKED                      , "CKR_PIN_LOCKED                      "},
+{CKR_SESSION_CLOSED                  , "CKR_SESSION_CLOSED                  "},
+{CKR_SESSION_COUNT                   , "CKR_SESSION_COUNT                   "},
+{CKR_SESSION_HANDLE_INVALID          , "CKR_SESSION_HANDLE_INVALID          "},
+{CKR_SESSION_PARALLEL_NOT_SUPPORTED  , "CKR_SESSION_PARALLEL_NOT_SUPPORTED  "},
+{CKR_SESSION_READ_ONLY               , "CKR_SESSION_READ_ONLY               "},
+{CKR_SESSION_EXISTS                  , "CKR_SESSION_EXISTS                  "},
+{CKR_SESSION_READ_ONLY_EXISTS        , "CKR_SESSION_READ_ONLY_EXISTS        "},
+{CKR_SESSION_READ_WRITE_SO_EXISTS    , "CKR_SESSION_READ_WRITE_SO_EXISTS    "},
+{CKR_SIGNATURE_INVALID               , "CKR_SIGNATURE_INVALID               "},
+{CKR_SIGNATURE_LEN_RANGE             , "CKR_SIGNATURE_LEN_RANGE             "},
+{CKR_TEMPLATE_INCOMPLETE             , "CKR_TEMPLATE_INCOMPLETE             "},
+{CKR_TEMPLATE_INCONSISTENT           , "CKR_TEMPLATE_INCONSISTENT           "},
+{CKR_TOKEN_NOT_PRESENT               , "CKR_TOKEN_NOT_PRESENT               "},
+{CKR_TOKEN_NOT_RECOGNIZED            , "CKR_TOKEN_NOT_RECOGNIZED            "},
+{CKR_TOKEN_WRITE_PROTECTED           , "CKR_TOKEN_WRITE_PROTECTED           "},
+{CKR_UNWRAPPING_KEY_HANDLE_INVALID   , "CKR_UNWRAPPING_KEY_HANDLE_INVALID   "},
+{CKR_UNWRAPPING_KEY_SIZE_RANGE       , "CKR_UNWRAPPING_KEY_SIZE_RANGE       "},
+{CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT, "CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT"},
+{CKR_USER_ALREADY_LOGGED_IN          , "CKR_USER_ALREADY_LOGGED_IN          "},
+{CKR_USER_NOT_LOGGED_IN              , "CKR_USER_NOT_LOGGED_IN              "},
+{CKR_USER_PIN_NOT_INITIALIZED        , "CKR_USER_PIN_NOT_INITIALIZED        "},
+{CKR_USER_TYPE_INVALID               , "CKR_USER_TYPE_INVALID               "},
+{CKR_USER_ANOTHER_ALREADY_LOGGED_IN  , "CKR_USER_ANOTHER_ALREADY_LOGGED_IN  "},
+{CKR_USER_TOO_MANY_TYPES             , "CKR_USER_TOO_MANY_TYPES             "},
+{CKR_WRAPPED_KEY_INVALID             , "CKR_WRAPPED_KEY_INVALID             "},
+{CKR_WRAPPED_KEY_LEN_RANGE           , "CKR_WRAPPED_KEY_LEN_RANGE           "},
+{CKR_WRAPPING_KEY_HANDLE_INVALID     , "CKR_WRAPPING_KEY_HANDLE_INVALID     "},
+{CKR_WRAPPING_KEY_SIZE_RANGE         , "CKR_WRAPPING_KEY_SIZE_RANGE         "},
+{CKR_WRAPPING_KEY_TYPE_INCONSISTENT  , "CKR_WRAPPING_KEY_TYPE_INCONSISTENT  "},
+{CKR_RANDOM_SEED_NOT_SUPPORTED       , "CKR_RANDOM_SEED_NOT_SUPPORTED       "},
+{CKR_RANDOM_NO_RNG                   , "CKR_RANDOM_NO_RNG                   "},
+{CKR_DOMAIN_PARAMS_INVALID           , "CKR_DOMAIN_PARAMS_INVALID           "},
+{CKR_BUFFER_TOO_SMALL                , "CKR_BUFFER_TOO_SMALL                "},
+{CKR_SAVED_STATE_INVALID             , "CKR_SAVED_STATE_INVALID             "},
+{CKR_INFORMATION_SENSITIVE           , "CKR_INFORMATION_SENSITIVE           "},
+{CKR_STATE_UNSAVEABLE                , "CKR_STATE_UNSAVEABLE                "},
+{CKR_CRYPTOKI_NOT_INITIALIZED        , "CKR_CRYPTOKI_NOT_INITIALIZED        "},
+{CKR_CRYPTOKI_ALREADY_INITIALIZED    , "CKR_CRYPTOKI_ALREADY_INITIALIZED    "},
+{CKR_MUTEX_BAD                       , "CKR_MUTEX_BAD                       "},
+{CKR_MUTEX_NOT_LOCKED                , "CKR_MUTEX_NOT_LOCKED                "},
+{CKR_FUNCTION_REJECTED               , "CKR_FUNCTION_REJECTED               "},
+{CKR_VENDOR_DEFINED                  , "CKR_VENDOR_DEFINED                  "},
+{0xCE534351                          , "CKR_NETSCAPE_CERTDB_FAILED          "},
+{0xCE534352                          , "CKR_NETSCAPE_KEYDB_FAILED           "}
+
 };
 
+static const CK_ULONG numStrings = sizeof(errStrings) / sizeof(tuple_str);
 
+/* Returns constant error string for "CRV".
+ * Returns "unknown error" if errNum is unknown.
+ */
+static const char *
+CK_RVtoStr(CK_RV errNum) {
+    CK_ULONG low  = 1;
+    CK_ULONG high = numStrings - 1;
+    CK_ULONG i;
+    CK_RV num;
+    static int initDone;
+
+    /* make sure table is in  ascending order.
+     * binary search depends on it.
+     */
+    if (!initDone) {
+        CK_RV lastNum = CKR_OK;
+        for (i = low; i <= high; ++i) {
+            num = errStrings[i].errNum;
+            if (num <= lastNum) {
+                PR_fprintf(PR_STDERR,
+                        "sequence error in error strings at item %d\n"
+                        "error %d (%s)\n"
+                        "should come after \n"
+                        "error %d (%s)\n",
+                        (int) i, (int) lastNum, errStrings[i-1].errString,
+                        (int) num, errStrings[i].errString);
+            }
+            lastNum = num;
+        }
+        initDone = 1;
+    }
+
+    /* Do binary search of table. */
+    while (low + 1 < high) {
+        i = (low + high) / 2;
+        num = errStrings[i].errNum;
+        if (errNum == num)
+            return errStrings[i].errString;
+        if (errNum < num)
+            high = i;
+        else
+            low = i;
+    }
+    if (errNum == errStrings[low].errNum)
+        return errStrings[low].errString;
+    if (errNum == errStrings[high].errNum)
+        return errStrings[high].errString;
+    return "unknown error";
+}
+
+static void 
+pk11error(const char *string, CK_RV crv) {
+    PRErrorCode errorcode;
+
+    PR_fprintf(PR_STDERR, "%s: 0x%08lX, %-26s\n", string, crv, CK_RVtoStr(crv));
 
-int
-main (int argc, char **argv)
+    errorcode = PR_GetError();
+    if (errorcode) {
+        PR_fprintf(PR_STDERR, "NSPR error code: %d: %s\n", errorcode,
+                PR_ErrorToString(errorcode, PR_LANGUAGE_I_DEFAULT));
+    }
+}
+
+static void 
+logIt(const char *fmt, ...) {
+    va_list args;
+
+    if (verbose) {
+        va_start (args, fmt);
+        vprintf(fmt, args);
+        va_end(args);
+    }
+}
+
+static CK_RV 
+softokn_Init(CK_FUNCTION_LIST_PTR pFunctionList, const char * configDir,
+            const char * dbPrefix) {
+
+    CK_RV crv = CKR_OK;
+    CK_C_INITIALIZE_ARGS initArgs;
+    char *moduleSpec = NULL;
+
+    initArgs.CreateMutex = NULL;
+    initArgs.DestroyMutex = NULL;
+    initArgs.LockMutex = NULL;
+    initArgs.UnlockMutex = NULL;
+    initArgs.flags = CKF_OS_LOCKING_OK;
+    if (configDir) {
+        moduleSpec = PR_smprintf("configdir='%s' certPrefix='%s' "
+                             "keyPrefix='%s' secmod='secmod.db' flags=ReadOnly ",
+                             configDir, dbPrefix, dbPrefix);
+    } else {
+        moduleSpec = PR_smprintf("configdir='' certPrefix='' keyPrefix='' "
+                                 "secmod='' flags=noCertDB, noModDB");
+    }
+    if (!moduleSpec) {
+        PR_fprintf(PR_STDERR, "softokn_Init: out of memory error\n");
+        return CKR_HOST_MEMORY;
+    } 
+    logIt("moduleSpec %s\n", moduleSpec);
+    initArgs.LibraryParameters = (CK_CHAR_PTR *) moduleSpec;
+    initArgs.pReserved = NULL;
+
+    crv = pFunctionList->C_Initialize(&initArgs);
+    if (crv != CKR_OK) {
+        pk11error("C_Initialize failed", crv);
+        goto cleanup;
+    }
+
+cleanup:
+    if (moduleSpec) {
+        PR_smprintf_free(moduleSpec);
+    }
+
+    return crv;
+}
+
+static char * 
+filePasswd(char *pwFile)
 {
-    int		 retval = 1;  /* 0 - test succeeded.  1 - test failed */
-    SECStatus	 rv;
-    PLOptState	*optstate;
-    char	*program_name;
-    const char  *input_file = NULL; 	/* read encrypted data from here (or create) */
+    unsigned char phrase[200];
+    PRFileDesc *fd;
+    PRInt32 nb;
+    int i;
+
+    if (!pwFile)
+        return 0;
+
+    fd = PR_Open(pwFile, PR_RDONLY, 0);
+    if (!fd) {
+        lperror(pwFile);
+        return NULL;
+    }
+
+    nb = PR_Read(fd, phrase, sizeof(phrase));
+
+    PR_Close(fd);
+    /* handle the Windows EOL case */
+    i = 0;
+    while (phrase[i] != '\r' && phrase[i] != '\n' && i < nb) i++;
+    phrase[i] = '\0';
+    if (nb == 0) {
+        PR_fprintf(PR_STDERR,"password file contains no data\n");
+        return NULL;
+    }
+    return (char*) PL_strdup((char*)phrase);
+}
+
+static void 
+checkPath(char *string)
+{
+    char *src;
+    char *dest;
+
+    /*
+     * windows support convert any back slashes to
+     * forward slashes.
+     */
+    for (src=string, dest=string; *src; src++,dest++) {
+        if (*src == '\\') {
+            *dest = '/';
+        }
+    }
+    dest--;
+    /* if the last char is a / set it to 0 */
+    if (*dest == '/')
+        *dest = 0;
+
+}
+
+static CK_SLOT_ID *
+getSlotList(CK_FUNCTION_LIST_PTR pFunctionList,
+            CK_ULONG slotIndex) {
+    CK_RV crv = CKR_OK;
+    CK_SLOT_ID *pSlotList = NULL;
+    CK_ULONG slotCount;
+
+    /* Get slot list */
+    crv = pFunctionList->C_GetSlotList(CK_FALSE /* all slots */,
+                                       NULL, &slotCount);
+    if (crv != CKR_OK) {
+        pk11error( "C_GetSlotList failed", crv);
+        return NULL;
+    }
+
+    if (slotIndex >= slotCount) {
+        PR_fprintf(PR_STDERR, "provided slotIndex is greater than the slot count.");
+        return NULL;
+    }
+
+    pSlotList = (CK_SLOT_ID *)PR_Malloc(slotCount * sizeof(CK_SLOT_ID));
+    if (!pSlotList) {
+        lperror("failed to allocate slot list");
+        return NULL;
+    }
+    crv = pFunctionList->C_GetSlotList(CK_FALSE /* all slots */,
+                                       pSlotList, &slotCount);
+    if (crv != CKR_OK) {
+        pk11error( "C_GetSlotList failed", crv);
+        if (pSlotList) PR_Free(pSlotList);
+        return NULL;
+    }
+    return pSlotList;
+}
+
+int main(int argc, char **argv)
+{
+    PLOptState *optstate;
+    char *program_name;
+    char *libname = NULL;
+    PRLibrary *lib;
+    PRFileDesc *fd;
+    PRStatus rv = PR_SUCCESS;
+    const char  *input_file = NULL; /* read/create encrypted data from here */
     char  *output_file = NULL;	/* write new encrypted data here */
-    PRBool      verbose = PR_FALSE;
-    SECKEYPrivateKey *privk = NULL;
-    SECKEYPublicKey *pubk = NULL;
-    PK11SlotInfo *slot = NULL;
-    PRFileDesc *fd;
     int bytesRead;
     int bytesWritten;
     unsigned char file_buf[512];
-    unsigned char hash_buf[SHA1_LENGTH];
-    unsigned char sign_buf[40]; /* DSA_LENGTH */
-    SECItem hash,sign;
-    PK11Context *hashcx = NULL;
     int count=0;
-    int keySize = 1024;
-    const char *nssDir = NULL;
-    secuPWData  pwdata = { PW_NONE, 0 };
+    int i;
+    PRBool verify = PR_FALSE;
+    static PRBool FIPSMODE = PR_FALSE;
+
 #ifdef USES_LINKS
     int ret;
     struct stat stat_buf;
     char link_buf[MAXPATHLEN+1];
     char *link_file = NULL;
 #endif
 
-    hash.len = sizeof(hash_buf); hash.data = hash_buf;
-    sign.len = sizeof(sign_buf); sign.data = sign_buf;
+    char *pwd = NULL;
+    char *configDir = NULL;
+    char *dbPrefix = NULL;
+    char *disableUnload = NULL;
+
+    CK_C_GetFunctionList pC_GetFunctionList;
+    CK_TOKEN_INFO tokenInfo;
+    CK_FUNCTION_LIST_PTR pFunctionList = NULL;
+    CK_RV crv = CKR_OK;
+    CK_SESSION_HANDLE hRwSession;
+    CK_SLOT_ID *pSlotList = NULL;
+    CK_ULONG slotIndex = 0; 
+    CK_MECHANISM digestmech;
+    CK_ULONG digestLen = 0;
+    CK_BYTE digest[20]; /* SHA1_LENGTH */
+    CK_BYTE sign[40];   /* DSA SIGNATURE LENGTH */
+    CK_ULONG signLen = 0 ;
+    CK_MECHANISM signMech = {
+        CKM_DSA, NULL, 0
+    };
+
+    /*** DSA Key ***/
+
+    CK_MECHANISM dsaKeyPairGenMech;
+    CK_ATTRIBUTE dsaPubKeyTemplate[5];
+    CK_ATTRIBUTE dsaPrivKeyTemplate[5];
+    CK_OBJECT_HANDLE hDSApubKey = CK_INVALID_HANDLE;
+    CK_OBJECT_HANDLE hDSAprivKey = CK_INVALID_HANDLE;
+
+    CK_BYTE dsaPubKey[128];
+    CK_ATTRIBUTE dsaPubKeyValue;
 
-    program_name = PL_strrchr(argv[0], '/');
+    /* DSA key init */
+    dsaPubKeyTemplate[0].type       = CKA_PRIME;
+    dsaPubKeyTemplate[0].pValue     = (CK_VOID_PTR) &prime;
+    dsaPubKeyTemplate[0].ulValueLen = sizeof(prime);
+    dsaPubKeyTemplate[1].type = CKA_SUBPRIME;
+    dsaPubKeyTemplate[1].pValue = (CK_VOID_PTR) &subprime;
+    dsaPubKeyTemplate[1].ulValueLen = sizeof(subprime);
+    dsaPubKeyTemplate[2].type = CKA_BASE;
+    dsaPubKeyTemplate[2].pValue = (CK_VOID_PTR) &base;
+    dsaPubKeyTemplate[2].ulValueLen = sizeof(base);
+    dsaPubKeyTemplate[3].type = CKA_TOKEN;
+    dsaPubKeyTemplate[3].pValue = &false; /* session object */
+    dsaPubKeyTemplate[3].ulValueLen = sizeof(false);
+    dsaPubKeyTemplate[4].type = CKA_VERIFY;
+    dsaPubKeyTemplate[4].pValue = &true;
+    dsaPubKeyTemplate[4].ulValueLen = sizeof(true);
+    dsaKeyPairGenMech.mechanism      = CKM_DSA_KEY_PAIR_GEN;
+    dsaKeyPairGenMech.pParameter = NULL;
+    dsaKeyPairGenMech.ulParameterLen = 0;
+    dsaPrivKeyTemplate[0].type       = CKA_TOKEN;
+    dsaPrivKeyTemplate[0].pValue     = &false; /* session object */
+    dsaPrivKeyTemplate[0].ulValueLen = sizeof(false);
+    dsaPrivKeyTemplate[1].type       = CKA_PRIVATE;
+    dsaPrivKeyTemplate[1].pValue     = &true;
+    dsaPrivKeyTemplate[1].ulValueLen = sizeof(true);
+    dsaPrivKeyTemplate[2].type       = CKA_SENSITIVE;
+    dsaPrivKeyTemplate[2].pValue     = &true; 
+    dsaPrivKeyTemplate[2].ulValueLen = sizeof(true);
+    dsaPrivKeyTemplate[3].type       = CKA_SIGN,
+    dsaPrivKeyTemplate[3].pValue     = &true;
+    dsaPrivKeyTemplate[3].ulValueLen = sizeof(true);
+    dsaPrivKeyTemplate[4].type       = CKA_EXTRACTABLE;
+    dsaPrivKeyTemplate[4].pValue     = &false;
+    dsaPrivKeyTemplate[4].ulValueLen = sizeof(false);
+    digestmech.mechanism = CKM_SHA_1;
+    digestmech.pParameter = NULL;
+    digestmech.ulParameterLen = 0;
+
+    program_name = strrchr(argv[0], '/');
     program_name = program_name ? (program_name + 1) : argv[0];
-
-    optstate = PL_CreateOptState (argc, argv, "d:f:i:o:p:v");
+    optstate = PL_CreateOptState (argc, argv, "i:o:f:Fd:hH?p:P:vVs:");
     if (optstate == NULL) {
-	SECU_PrintError (program_name, "PL_CreateOptState failed");
-	return 1;
+        lperror("PL_CreateOptState failed");
+        return 1;
     }
 
     while (PL_GetNextOpt (optstate) == PL_OPT_OK) {
-	switch (optstate->option) {
-#ifdef notdef
-	  case '?':
-	    short_usage (program_name);
-	    return 0;
+        switch (optstate->option) {
+
+            case 'd':
+                if (!optstate->value) {
+                    PL_DestroyOptState(optstate);
+                    usage(program_name);
+                }
+                configDir = PL_strdup(optstate->value);
+                checkPath(configDir);
+                break;
+
+                case 'i':
+                if (!optstate->value) {
+                    PL_DestroyOptState(optstate);
+                    usage(program_name);
+                }
+                input_file = optstate->value;
+                break;
 
-	  case 'H':
-	    long_usage (program_name);
-	    return 0;
-#endif
+                case 'o':
+                if (!optstate->value) {
+                    PL_DestroyOptState(optstate);
+                    usage(program_name);
+                }
+                output_file = PL_strdup(optstate->value);
+                break;
 
-	  case 'd':
-	    nssDir = optstate->value;
-	    break;
+                case 'f':
+                if (!optstate->value) {
+                    PL_DestroyOptState(optstate);
+                    usage(program_name);
+                }
+                pwd = filePasswd((char *)optstate->value);
+                if (!pwd) usage(program_name);
+                break;
 
-          case 'i':
-            input_file = optstate->value;
-            break;
+                case 'F':
+                FIPSMODE = PR_TRUE;
+                break;
 
-          case 'o':
-            output_file = PORT_Strdup(optstate->value);
-            break;
+                case 'p':
+                if (!optstate->value) {
+                    PL_DestroyOptState(optstate);
+                    usage(program_name);
+                }
+                pwd =  PL_strdup(optstate->value);
+                break;
 
-          case 'f':
-            pwdata.source = PW_FROMFILE;
-            pwdata.data = PORT_Strdup(optstate->value);
-            break;
+                case 'P':
+                if (!optstate->value) {
+                    PL_DestroyOptState(optstate);
+                    usage(program_name);
+                }
+                dbPrefix = PL_strdup(optstate->value);
+                break;
+
+                case 'v':
+                verbose = PR_TRUE;
+                break;
 
-          case 'p':
-            pwdata.source = PW_PLAINTEXT;
-            pwdata.data = PORT_Strdup(optstate->value);
-            break;
+                case 'V':
+                verify = PR_TRUE;
+                break;
+
+                case 'H':
+                PL_DestroyOptState(optstate);
+                long_usage (program_name);
+                return 1;
+                break;
 
-          case 'v':
-            verbose = PR_TRUE;
-            break;
-	}
+                case 'h':
+                case '?':
+                default:
+                PL_DestroyOptState(optstate);
+                usage(program_name);
+                return 1;
+                break;
+        }
+    }
+    PL_DestroyOptState(optstate);
+
+    if (!input_file) {
+        usage(program_name);
+        return 1;
     }
 
-    if (input_file == NULL) {
-	usage(program_name);
-	return 1;
-    }
+    /* Get the platform-dependent library name of the
+     * NSS cryptographic module.
+     */
+    libname = PR_GetLibraryName(NULL, "softokn3");
+    assert(libname != NULL);
+    lib = PR_LoadLibrary(libname);
+    assert(lib != NULL);
+    PR_FreeLibraryName(libname);
+
 
-    /*
-     * Initialize the Security libraries.
-     */
-    PK11_SetPasswordFunc(SECU_GetModulePassword);
+    if (FIPSMODE) {
+        /* FIPSMODE == FC_GetFunctionList */
+        /* library path must be set to an already signed softokn3/freebl */
+        pC_GetFunctionList = (CK_C_GetFunctionList)
+                             PR_FindFunctionSymbol(lib, "FC_GetFunctionList");
+    } else {
+        /* NON FIPS mode  == C_GetFunctionList */
+        pC_GetFunctionList = (CK_C_GetFunctionList)
+                             PR_FindFunctionSymbol(lib, "C_GetFunctionList");
+     }
+    assert(pC_GetFunctionList != NULL);
 
-    if (nssDir) {
-        rv = NSS_Init(nssDir);
-        if (rv != SECSuccess) {
-            rv = NSS_NoDB_Init("");
+    crv = (*pC_GetFunctionList)(&pFunctionList);
+    assert(crv == CKR_OK);
+
+    if (configDir) {
+    if (!dbPrefix) {
+            dbPrefix = PL_strdup("");
+        }
+        crv = softokn_Init(pFunctionList, configDir, dbPrefix);
+        if (crv != CKR_OK) {
+            logIt("Failed to use provided database directory "
+                  "will just initialize the volatile certdb.\n");
+            crv = softokn_Init(pFunctionList, NULL, NULL); /* NoDB Init */
         }
     } else {
-        rv = NSS_NoDB_Init("");
+        crv = softokn_Init(pFunctionList, NULL, NULL); /* NoDB Init */
     }
-    
-    if (rv != SECSuccess) {
-	lperror("NSS_Init failed");
-	goto prdone;
+
+    if (crv != CKR_OK) {
+        pk11error( "Initiailzing softoken failed", crv);
+        goto cleanup;
     }
-    
-    /* Generate a DSA Key pair */
-    slot = PK11_GetBestSlot(CKM_DSA,&pwdata);
-    if (slot == NULL) {
-	lperror("CKM_DSA");
-	goto loser;
-	
+
+    pSlotList = getSlotList(pFunctionList, slotIndex);
+    if (pSlotList == NULL) {
+        PR_fprintf(PR_STDERR, "getSlotList failed");
+        goto cleanup;
     }
-    printf("Generating DSA Key Pair...."); fflush(stdout);
-    privk = PK11_GenerateKeyPair(slot, CKM_DSA_KEY_PAIR_GEN, &pqgParams, &pubk, 
-						PR_FALSE, PR_TRUE, &pwdata);
-    if (privk == NULL) {
-	lperror("Generating DSA Key");
-	goto loser;
+
+    crv = pFunctionList->C_OpenSession(pSlotList[slotIndex],
+                                       CKF_RW_SESSION | CKF_SERIAL_SESSION,
+                                       NULL, NULL, &hRwSession);
+    if (crv != CKR_OK) {
+        pk11error( "Opening a read/write session failed", crv);
+        goto cleanup;
     }
 
-    printf("done\n");
+    /* check if a password is needed */
+    crv = pFunctionList->C_GetTokenInfo(pSlotList[slotIndex], &tokenInfo);
+    if (crv != CKR_OK) {
+        pk11error( "C_GetTokenInfo failed", crv);
+        goto cleanup;
+    }
+    if (tokenInfo.flags & CKF_LOGIN_REQUIRED) {
+        if (pwd) {
+            int pwdLen = strlen((const char*)pwd); 
+            crv = pFunctionList->C_Login(hRwSession, CKU_USER, 
+                                (CK_UTF8CHAR_PTR) pwd, (CK_ULONG)pwdLen);
+            if (crv != CKR_OK) {
+                pk11error("C_Login failed", crv);
+                goto cleanup;
+            }
+        } else {
+            PR_fprintf(PR_STDERR, "Please provide the password for the token");
+            goto cleanup;
+        }
+    } else if (pwd) {
+        logIt("A password was provided but the password was not used.\n");
+    }
+
+    /* Generate a DSA key pair */
+    logIt("Generate a DSA key pair ... \n");
+    crv = pFunctionList->C_GenerateKeyPair(hRwSession, &dsaKeyPairGenMech,
+                                           dsaPubKeyTemplate,
+                                           NUM_ELEM(dsaPubKeyTemplate),
+                                           dsaPrivKeyTemplate,
+                                           NUM_ELEM(dsaPrivKeyTemplate),
+                                           &hDSApubKey, &hDSAprivKey);
+    if (crv != CKR_OK) {
+        pk11error("DSA key pair generation failed", crv);
+        goto cleanup;
+    }
 
     /* open the shared library */
     fd = PR_OpenFile(input_file,PR_RDONLY,0);
     if (fd == NULL ) {
-	lperror(input_file);
-	goto loser;
+        lperror(input_file);
+        goto cleanup;
     }
 #ifdef USES_LINKS
     ret = lstat(input_file, &stat_buf);
     if (ret < 0) {
-	perror(input_file);
-	goto loser;
+        perror(input_file);
+        goto cleanup;
     }
     if (S_ISLNK(stat_buf.st_mode)) {
-	char *dirpath,*dirend;
-	ret = readlink(input_file, link_buf, sizeof(link_buf) - 1);
-	if (ret < 0) {
-	   perror(input_file);
-	   goto loser;
-	}
-	link_buf[ret] = 0;
-	link_file = mkoutput(input_file);
-	/* get the dirname of input_file */
-	dirpath = PORT_Strdup(input_file);
-	dirend = PORT_Strrchr(dirpath, '/');
-	if (dirend) {
-	    *dirend = '\0';
-	    ret = chdir(dirpath);
-	    if (ret < 0) {
-		perror(dirpath);
-		goto loser;
-	    }
-	}
-	PORT_Free(dirpath);
-	input_file = link_buf;
-	/* get the basename of link_file */
-	dirend = PORT_Strrchr(link_file, '/');
-	if (dirend) {
-	    link_file = dirend + 1;
-	}
+        char *dirpath,*dirend;
+        ret = readlink(input_file, link_buf, sizeof(link_buf) - 1);
+        if (ret < 0) {
+            perror(input_file);
+            goto cleanup;
+        }
+        link_buf[ret] = 0;
+        link_file = mkoutput(input_file);
+        /* get the dirname of input_file */
+        dirpath = PL_strdup(input_file);
+        dirend = strrchr(dirpath, '/');
+        if (dirend) {
+            *dirend = '\0';
+            ret = chdir(dirpath);
+            if (ret < 0) {
+                perror(dirpath);
+                goto cleanup;
+            }
+        }
+        PL_strfree(dirpath);
+        input_file = link_buf;
+        /* get the basename of link_file */
+        dirend = strrchr(link_file, '/');
+        if (dirend) {
+            char * tmp_file = NULL;
+            tmp_file = PL_strdup(dirend +1 );
+            PL_strfree(link_file);
+            link_file = tmp_file;
+        }
     }
 #endif
     if (output_file == NULL) {
-	output_file = mkoutput(input_file);
+        output_file = mkoutput(input_file);
+    }
+
+    /* compute the digest */
+    memset(digest, 0, sizeof(digest));
+    crv = pFunctionList->C_DigestInit(hRwSession, &digestmech);
+    if (crv != CKR_OK) {
+        pk11error("C_DigestInit failed", crv);
+        goto cleanup;
     }
 
-    hashcx = PK11_CreateDigestContext(SEC_OID_SHA1);
-    if (hashcx == NULL) {
-	lperror("SHA1 Digest Create");
-	goto loser;
+    /* Digest the file */
+    while ((bytesRead = PR_Read(fd,file_buf,sizeof(file_buf))) > 0) {
+        crv = pFunctionList->C_DigestUpdate(hRwSession, (CK_BYTE_PTR)file_buf,
+                                            bytesRead);
+        if (crv != CKR_OK) {
+            pk11error("C_DigestUpdate failed", crv);
+            goto cleanup;
+        }
+        count += bytesRead;
     }
 
-    /* hash the file */
-    while ((bytesRead = PR_Read(fd,file_buf,sizeof(file_buf))) > 0) {
-	PK11_DigestOp(hashcx,file_buf,bytesRead);
-	count += bytesRead;
-    }
-
+    /* close the input_File */
     PR_Close(fd);
     fd = NULL;
     if (bytesRead < 0) {
-	lperror(input_file);
-	goto loser;
+        lperror("0 bytes read from input file");
+        goto cleanup;
+    }
+
+    digestLen = sizeof(digest);
+    crv = pFunctionList->C_DigestFinal(hRwSession, (CK_BYTE_PTR)digest,
+                                       &digestLen);
+    if (crv != CKR_OK) {
+        pk11error("C_DigestFinal failed", crv);
+        goto cleanup;
+    }
+
+    if (digestLen != sizeof(digest)) {
+        PR_fprintf(PR_STDERR, "digestLen has incorrect length %lu "
+                "it should be %lu \n",digestLen, sizeof(digest));
+        goto cleanup;
+    }
+
+    /* sign the hash */
+    memset(sign, 0, sizeof(sign));
+    /* SignUpdate  */
+    crv = pFunctionList->C_SignInit(hRwSession, &signMech, hDSAprivKey);
+    if (crv != CKR_OK) {
+        pk11error("C_SignInit failed", crv);
+        goto cleanup;
     }
 
-
-    PK11_DigestFinal(hashcx, hash.data, &hash.len, hash.len);
-
-    if (hash.len != SHA1_LENGTH) {
-	fprintf(stderr, "Digest length was not correct\n");
-	goto loser;
+    signLen = sizeof(sign);
+    crv = pFunctionList->C_Sign(hRwSession, (CK_BYTE * ) digest, digestLen,
+                                sign, &signLen);
+    if (crv != CKR_OK) {
+        pk11error("C_Sign failed", crv);
+        goto cleanup;
     }
 
-    /* signe the hash */
-    rv = PK11_Sign(privk,&sign,&hash);
-    if (rv != SECSuccess) {
-	lperror("Signing");
-	goto loser;
+    if (signLen != sizeof(sign)) {
+        PR_fprintf(PR_STDERR, "signLen has incorrect length %lu "
+                    "it should be %lu \n", signLen, sizeof(sign));
+        goto cleanup;
+    }
+
+    if (verify) {
+        crv = pFunctionList->C_VerifyInit(hRwSession, &signMech, hDSApubKey);
+        if (crv != CKR_OK) {
+            pk11error("C_VerifyInit failed", crv);
+            goto cleanup;
+        }
+        crv = pFunctionList->C_Verify(hRwSession, digest, digestLen,
+                                      sign, signLen);
+        if (crv != CKR_OK) {
+            pk11error("C_Verify failed", crv);
+            goto cleanup;
+        }
     }
 
     if (verbose) {
-	int i,j;
-	fprintf(stderr,"Library File: %s %d bytes\n",input_file, count);
-	fprintf(stderr,"Check File: %s\n",output_file);
+        int j;
+        PR_fprintf(PR_STDERR,"Library File: %s %d bytes\n",input_file, count);
+        PR_fprintf(PR_STDERR,"Check File: %s\n",output_file);
 #ifdef USES_LINKS
-	if (link_file) {
-	    fprintf(stderr,"Link: %s\n",link_file);
-	}
+        if (link_file) {
+            PR_fprintf(PR_STDERR,"Link: %s\n",link_file);
+        }
 #endif
-	fprintf(stderr,"  hash: %d bytes\n", hash.len);
+        PR_fprintf(PR_STDERR,"  hash: %lu bytes\n", digestLen);
 #define STEP 10
-	for (i=0; i < hash.len; i += STEP) {
-	   fprintf(stderr,"   ");
-	   for (j=0; j < STEP && (i+j) < hash.len; j++) {
-		fprintf(stderr," %02x", hash.data[i+j]);
-	   }
-	   fprintf(stderr,"\n");
-	}
-	fprintf(stderr,"  signature: %d bytes\n", sign.len);
-	for (i=0; i < sign.len; i += STEP) {
-	   fprintf(stderr,"   ");
-	   for (j=0; j < STEP && (i+j) < sign.len; j++) {
-		fprintf(stderr," %02x", sign.data[i+j]);
-	   }
-	   fprintf(stderr,"\n");
-	}
+        for (i=0; i < (int) digestLen; i += STEP) {
+            PR_fprintf(PR_STDERR,"   ");
+            for (j=0; j < STEP && (i+j) < (int) digestLen; j++) {
+                PR_fprintf(PR_STDERR," %02x", digest[i+j]);
+            }
+            PR_fprintf(PR_STDERR,"\n");
+        }
+        PR_fprintf(PR_STDERR,"  signature: %lu bytes\n", signLen);
+        for (i=0; i < (int) signLen; i += STEP) {
+            PR_fprintf(PR_STDERR,"   ");
+            for (j=0; j < STEP && (i+j) < (int) signLen; j++) {
+                PR_fprintf(PR_STDERR," %02x", sign[i+j]);
+            }
+            PR_fprintf(PR_STDERR,"\n");
+        }
     }
 
     /* open the target signature file */
     fd = PR_OpenFile(output_file,PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE,0666);
     if (fd == NULL ) {
-	lperror(output_file);
-	goto loser;
+        lperror(output_file);
+        goto cleanup;
     }
 
     /*
      * we write the key out in a straight binary format because very
      * low level libraries need to read an parse this file. Ideally we should
      * just derEncode the public key (which would be pretty simple, and be
      * more general), but then we'd need to link the ASN.1 decoder with the
      * freebl libraries.
      */
 
     file_buf[0] = NSS_SIGN_CHK_MAGIC1;
     file_buf[1] = NSS_SIGN_CHK_MAGIC2;
     file_buf[2] = NSS_SIGN_CHK_MAJOR_VERSION;
     file_buf[3] = NSS_SIGN_CHK_MINOR_VERSION;
-    encodeInt(&file_buf[4],12);			/* offset to data start */
+    encodeInt(&file_buf[4],12);  /* offset to data start */
     encodeInt(&file_buf[8],CKK_DSA);
     bytesWritten = PR_Write(fd,file_buf, 12);
     if (bytesWritten != 12) {
-	lperror(output_file);
-	goto loser;
+        lperror(output_file);
+        goto cleanup;
+    }
+
+    /* get DSA Public KeyValue */
+    memset(dsaPubKey, 0, sizeof(dsaPubKey));
+    dsaPubKeyValue.type =CKA_VALUE;
+    dsaPubKeyValue.pValue = (CK_VOID_PTR) &dsaPubKey;
+    dsaPubKeyValue.ulValueLen = sizeof(dsaPubKey);
+
+    crv = pFunctionList->C_GetAttributeValue(hRwSession, hDSApubKey,
+                                             &dsaPubKeyValue, 1);
+    if (crv != CKR_OK && crv != CKR_ATTRIBUTE_TYPE_INVALID) {
+        pk11error("C_GetAttributeValue failed", crv);
+        goto cleanup;
     }
 
-    rv = writeItem(fd,&pubk->u.dsa.params.prime,output_file);
-    if (rv != SECSuccess) goto loser;
-    rv = writeItem(fd,&pubk->u.dsa.params.subPrime,output_file);
-    if (rv != SECSuccess) goto loser;
-    rv = writeItem(fd,&pubk->u.dsa.params.base,output_file);
-    if (rv != SECSuccess) goto loser;
-    rv = writeItem(fd,&pubk->u.dsa.publicValue,output_file);
-    if (rv != SECSuccess) goto loser;
-    rv = writeItem(fd,&sign,output_file);
-    if (rv != SECSuccess) goto loser;
-
+    /* CKA_PRIME */
+    rv = writeItem(fd,dsaPubKeyTemplate[0].pValue,
+                   dsaPubKeyTemplate[0].ulValueLen, output_file);
+    if (rv != PR_SUCCESS) goto cleanup;
+    /* CKA_SUBPRIME */
+    rv = writeItem(fd,dsaPubKeyTemplate[1].pValue,
+                   dsaPubKeyTemplate[1].ulValueLen, output_file);
+    if (rv != PR_SUCCESS) goto cleanup;
+    /* CKA_BASE */ 
+    rv = writeItem(fd,dsaPubKeyTemplate[2].pValue,
+                   dsaPubKeyTemplate[2].ulValueLen, output_file);
+    if (rv != PR_SUCCESS) goto cleanup;
+    /* DSA Public Key value */
+    rv = writeItem(fd,dsaPubKeyValue.pValue,
+                   dsaPubKeyValue.ulValueLen, output_file);
+    if (rv != PR_SUCCESS) goto cleanup;
+    /* DSA SIGNATURE */
+    rv = writeItem(fd,&sign, signLen, output_file);
+    if (rv != PR_SUCCESS) goto cleanup;
     PR_Close(fd);
 
 #ifdef USES_LINKS
     if (link_file) {
-	(void)unlink(link_file);
-	ret = symlink(output_file, link_file);
-	if (ret < 0) {
-	   perror(link_file);
-	   goto loser;
-	}
+        (void)unlink(link_file);
+        ret = symlink(output_file, link_file);
+        if (ret < 0) {
+            perror(link_file);
+            goto cleanup;
+        }
     }
 #endif
 
-    retval = 0;
-
-loser:
-    if (hashcx) {
-        PK11_DestroyContext(hashcx, PR_TRUE);
+cleanup:
+    if (pFunctionList) {
+        /* C_Finalize will automatically logout, close session, */
+        /* and delete the temp objects on the token */
+        crv = pFunctionList->C_Finalize(NULL);
+        if (crv != CKR_OK) {
+            pk11error("C_Finalize failed", crv);
+        }
     }
-    if (privk) {
-        SECKEY_DestroyPrivateKey(privk);
+    if (pSlotList) {
+        PR_Free(pSlotList);
     }
-    if (pubk) {
-        SECKEY_DestroyPublicKey(pubk);
+    if (pwd) {
+        PL_strfree(pwd);
+    }
+    if (configDir) {
+        PL_strfree(configDir);
     }
-    if (slot) {
-        PK11_FreeSlot(slot);
+    if (dbPrefix) {
+        PL_strfree(dbPrefix);
     }
-    if (pwdata.data) {
-        PORT_Free(pwdata.data);
+    if (output_file) { /* allocated by mkoutput function */
+        PL_strfree(output_file); 
+    }
+#ifdef USES_LINKS
+    if (link_file) { /* allocated by mkoutput function */
+        PL_strfree(link_file); 
     }
-    if (NSS_Shutdown() != SECSuccess) {
-	exit(1);
-    }
+#endif
 
-prdone:
-    PR_Cleanup ();
-    return retval;
+    disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
+    if (!disableUnload) {
+        PR_UnloadLibrary(lib);
+    }
+    PR_Cleanup();
+
+    return crv;
 }