From 68e54ecade2ed39bcfed8eab6b55b568ebfca89e Mon Sep 17 00:00:00 2001
From: "nelsonb%netscape.com"
 <nelsonb%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 7 Jan 2001 07:43:28 +0000
Subject: [PATCH] Add missing #include "nss.h"

git-svn-id: svn://10.0.0.236/trunk@84516 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/cmd/certcgi/certcgi.c     | 1 +
 mozilla/security/nss/cmd/certutil/certutil.c   | 1 +
 mozilla/security/nss/cmd/crlutil/crlutil.c     | 1 +
 mozilla/security/nss/cmd/derdump/derdump.c     | 3 ++-
 mozilla/security/nss/cmd/modutil/modutil.c     | 1 +
 mozilla/security/nss/cmd/p7content/p7content.c | 3 ++-
 mozilla/security/nss/cmd/p7env/p7env.c         | 3 ++-
 mozilla/security/nss/cmd/p7sign/p7sign.c       | 3 ++-
 mozilla/security/nss/cmd/p7verify/p7verify.c   | 3 ++-
 mozilla/security/nss/cmd/signtool/util.c       | 1 +
 mozilla/security/nss/cmd/signver/signver.c     | 1 +
 11 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/mozilla/security/nss/cmd/certcgi/certcgi.c b/mozilla/security/nss/cmd/certcgi/certcgi.c
index d55ccc8edf9..0b9a023058c 100644
--- a/mozilla/security/nss/cmd/certcgi/certcgi.c
+++ b/mozilla/security/nss/cmd/certcgi/certcgi.c
@@ -51,6 +51,7 @@
 #include "pqgutil.h"
 #include "certxutl.h"
 #include "secrng.h"	/* for RNG_ */
+#include "nss.h"
 
 
 /* #define TEST           1 */
diff --git a/mozilla/security/nss/cmd/certutil/certutil.c b/mozilla/security/nss/cmd/certutil/certutil.c
index e762df1ccc6..5c0bfadbe90 100644
--- a/mozilla/security/nss/cmd/certutil/certutil.c
+++ b/mozilla/security/nss/cmd/certutil/certutil.c
@@ -62,6 +62,7 @@
 #include "cryptohi.h"
 #include "secoid.h"
 #include "certdb.h"
+#include "nss.h"
 
 #define MIN_KEY_BITS		512
 #define MAX_KEY_BITS		2048
diff --git a/mozilla/security/nss/cmd/crlutil/crlutil.c b/mozilla/security/nss/cmd/crlutil/crlutil.c
index 96522c5cdda..374c5d00cc9 100644
--- a/mozilla/security/nss/cmd/crlutil/crlutil.c
+++ b/mozilla/security/nss/cmd/crlutil/crlutil.c
@@ -44,6 +44,7 @@
 #include "secutil.h"
 #include "cert.h"
 #include "certdb.h"
+#include "nss.h"
 
 #define SEC_CERT_DB_EXISTS 0
 #define SEC_CREATE_CERT_DB 1
diff --git a/mozilla/security/nss/cmd/derdump/derdump.c b/mozilla/security/nss/cmd/derdump/derdump.c
index dfefe8bf0eb..ef1cb498895 100644
--- a/mozilla/security/nss/cmd/derdump/derdump.c
+++ b/mozilla/security/nss/cmd/derdump/derdump.c
@@ -32,6 +32,7 @@
  */
 
 #include "secutil.h"
+#include "nss.h"
 #include <errno.h>
 
 #if defined(XP_WIN) || (defined(__sun) && !defined(SVR4))
@@ -110,7 +111,7 @@ int main(int argc, char **argv)
     if (!inFile) inFile = PR_STDIN;
     if (!outFile) outFile = stdout;
 
-     NSS_NoDB_Init();
+    NSS_NoDB_Init(NULL);	/* XXX */
 
 	rv = SECU_ReadDERFromFile(&der, inFile, PR_FALSE);
     if (rv == SECSuccess) {
diff --git a/mozilla/security/nss/cmd/modutil/modutil.c b/mozilla/security/nss/cmd/modutil/modutil.c
index 1137e0c8249..ba2da3acff3 100644
--- a/mozilla/security/nss/cmd/modutil/modutil.c
+++ b/mozilla/security/nss/cmd/modutil/modutil.c
@@ -36,6 +36,7 @@
 #include <plstr.h>
 #include "secrng.h"
 #include "certdb.h" /* for CERT_DB_FILE_VERSION */
+#include "nss.h"
 
 static void install_error(char *message);
 static char* PR_fgets(char *buf, int size, PRFileDesc *file);
diff --git a/mozilla/security/nss/cmd/p7content/p7content.c b/mozilla/security/nss/cmd/p7content/p7content.c
index 880616c556a..f875971e4e5 100644
--- a/mozilla/security/nss/cmd/p7content/p7content.c
+++ b/mozilla/security/nss/cmd/p7content/p7content.c
@@ -34,7 +34,7 @@
 /*
  * p7content -- A command to display pkcs7 content.
  *
- * $Id: p7content.c,v 1.2 2001-01-06 22:08:51 relyea%netscape.com Exp $
+ * $Id: p7content.c,v 1.3 2001-01-07 07:43:13 nelsonb%netscape.com Exp $
  */
 
 #include "nspr.h"
@@ -43,6 +43,7 @@
 #include "secpkcs7.h"
 #include "cert.h"
 #include "certdb.h"
+#include "nss.h"
 
 #if defined(XP_UNIX)
 #include <unistd.h>
diff --git a/mozilla/security/nss/cmd/p7env/p7env.c b/mozilla/security/nss/cmd/p7env/p7env.c
index 1ab81a34be3..28ffe40bf0e 100644
--- a/mozilla/security/nss/cmd/p7env/p7env.c
+++ b/mozilla/security/nss/cmd/p7env/p7env.c
@@ -34,7 +34,7 @@
 /*
  * p7env -- A command to create a pkcs7 enveloped data.
  *
- * $Id: p7env.c,v 1.2 2001-01-06 22:08:54 relyea%netscape.com Exp $
+ * $Id: p7env.c,v 1.3 2001-01-07 07:43:15 nelsonb%netscape.com Exp $
  */
 
 #include "nspr.h"
@@ -43,6 +43,7 @@
 #include "secpkcs7.h"
 #include "cert.h"
 #include "certdb.h"
+#include "nss.h"
 
 #if defined(XP_UNIX)
 #include <unistd.h>
diff --git a/mozilla/security/nss/cmd/p7sign/p7sign.c b/mozilla/security/nss/cmd/p7sign/p7sign.c
index 4734de525ec..aa6d8226f17 100644
--- a/mozilla/security/nss/cmd/p7sign/p7sign.c
+++ b/mozilla/security/nss/cmd/p7sign/p7sign.c
@@ -35,7 +35,7 @@
  * p7sign -- A command to create a *detached* pkcs7 signature (over a given
  * input file).
  *
- * $Id: p7sign.c,v 1.3 2001-01-06 22:08:56 relyea%netscape.com Exp $
+ * $Id: p7sign.c,v 1.4 2001-01-07 07:43:17 nelsonb%netscape.com Exp $
  */
 
 #include "nspr.h"
@@ -45,6 +45,7 @@
 #include "cert.h"
 #include "certdb.h"
 #include "sechash.h"	/* for HASH_GetHashObject() */
+#include "nss.h"
 
 #if defined(XP_UNIX)
 #include <unistd.h>
diff --git a/mozilla/security/nss/cmd/p7verify/p7verify.c b/mozilla/security/nss/cmd/p7verify/p7verify.c
index fc511bce4db..342fafa8dd2 100644
--- a/mozilla/security/nss/cmd/p7verify/p7verify.c
+++ b/mozilla/security/nss/cmd/p7verify/p7verify.c
@@ -34,7 +34,7 @@
 /*
  * p7verify -- A command to do a verification of a *detached* pkcs7 signature.
  *
- * $Id: p7verify.c,v 1.3 2001-01-06 22:08:58 relyea%netscape.com Exp $
+ * $Id: p7verify.c,v 1.4 2001-01-07 07:43:24 nelsonb%netscape.com Exp $
  */
 
 #include "nspr.h"
@@ -45,6 +45,7 @@
 #include "certdb.h"
 #include "secoid.h"
 #include "sechash.h"	/* for HASH_GetHashObject() */
+#include "nss.h"
 
 #if defined(XP_UNIX)
 #include <unistd.h>
diff --git a/mozilla/security/nss/cmd/signtool/util.c b/mozilla/security/nss/cmd/signtool/util.c
index 43e3311ee44..a4cb21fa7e2 100644
--- a/mozilla/security/nss/cmd/signtool/util.c
+++ b/mozilla/security/nss/cmd/signtool/util.c
@@ -34,6 +34,7 @@
 #include "signtool.h"
 #include "prio.h"
 #include "prmem.h"
+#include "nss.h"
 
 static int is_dir (char *filename);
 
diff --git a/mozilla/security/nss/cmd/signver/signver.c b/mozilla/security/nss/cmd/signver/signver.c
index 2ea36f744b8..801256bb1c6 100644
--- a/mozilla/security/nss/cmd/signver/signver.c
+++ b/mozilla/security/nss/cmd/signver/signver.c
@@ -35,6 +35,7 @@
 #include "secmod.h"
 #include "cert.h"
 #include "secoid.h"
+#include "nss.h"
 
 /* NSPR 2.0 header files */
 #include "prinit.h"