integrate NSS 3.4 builds (stan parts now included)

git-svn-id: svn://10.0.0.236/trunk@105159 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/security/nss/lib/manifest.mn

@@ -33,13 +33,33 @@
 CORE_DEPTH = ../..
 DEPTH      = ../..
 
-DIRS = crmf jar \
-    certhigh pk11wrap cryptohi \
-    softoken certdb crypto \
-    util freebl nss pkcs12 fortcrypt \
-    base ckfw pkcs7 smime ssl
+DIRS =            \
+	base      \
+	asn1      \
+	dev       \
+	pki       \
+	pki1      \
+	crmf      \
+	jar       \
+	certhigh  \
+	pk11wrap  \
+	cryptohi  \
+	softoken  \
+	certdb    \
+	crypto    \
+	util      \
+	freebl    \
+	nss       \
+	pkcs12    \
+	fortcrypt \
+	pkcs7     \
+	smime     \
+	ssl       \
+	ckfw      \
+	$(NULL)
 
-ifdef BUILD_STAN
+# NSS 4.0 build - pure stan libraries
+ifdef PURE_STAN_BUILD
 DIRS = base asn1 dev pki pki1
 endif
 

mozilla/security/nss/lib/nss/config.mk

@@ -68,6 +68,9 @@ SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/softoken.lib \
 	$(CRYPTOLIB) \
 	$(DIST)/lib/secutil.lib \
+	$(DIST)/lib/nsspki.lib \
+	$(DIST)/lib/nssdev.lib \
+	$(DIST)/lib/nssb.lib \
 	$(NULL)
 
 SHARED_LIBRARY_DIRS = \
@@ -78,6 +81,9 @@ SHARED_LIBRARY_DIRS = \
 	../softoken \
 	$(CRYPTODIR) \
 	../util \
+	../pki \
+	../dev \
+	../base \
 	$(NULL)
 
 EXTRA_LIBS += \
@@ -116,6 +122,9 @@ SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/libcertdb.$(LIB_SUFFIX) \
 	$(CRYPTOLIB) \
 	$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
+	$(DIST)/lib/libnsspki.$(LIB_SUFFIX) \
+	$(DIST)/lib/libnssdev.$(LIB_SUFFIX) \
+	$(DIST)/lib/libnssb.$(LIB_SUFFIX) \
 	$(NULL)
 EXTRA_LIBS += \
 	$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
@@ -131,6 +140,9 @@ SHARED_LIBRARY_DIRS = \
 	../certdb \
 	$(CRYPTODIR) \
 	../util \
+	../pki \
+	../dev \
+	../base \
 	$(NULL)
 
 # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)

mozilla/security/nss/lib/nss/nssinit.c

@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- # $Id: nssinit.c,v 1.24 2001-09-20 21:39:58 relyea%netscape.com Exp $
+ # $Id: nssinit.c,v 1.25 2001-10-11 16:31:29 ian.mcgreer%sun.com Exp $
  */
 
 #include <ctype.h>
@@ -50,6 +50,8 @@
 #include "secrng.h"
 #include "pk11func.h"
 
+#include "pkinss3hack.h"
+
 #define NSS_MAX_FLAG_SIZE  sizeof("readOnly")+sizeof("noCertDB")+ \
 	sizeof("noModDB")+sizeof("forceOpen")+sizeof("passwordRequired")
 #define NSS_DEFAULT_MOD_NAME "NSS Internal Module"
@@ -238,6 +240,7 @@ nss_Init(const char *configdir, const char *certPrefix, const char *keyPrefix,
 	}
     }
 
+    STAN_LoadDefaultNSS3TrustDomain();
     return rv;
 }
 
@@ -375,4 +378,3 @@ NSS_VersionCheck(const char *importedVersion)
     return PR_TRUE;
 }
 
-