From 13447ee9b0d3d1d7d128ccdf4c498c787dc28cd3 Mon Sep 17 00:00:00 2001
From: "nelsonb%netscape.com" <nelsonb%netscape.com>
Date: Sun, 7 Jan 2001 07:56:35 +0000
Subject: [PATCH] Eliminate some warnings by adding missing #include lines, or
 other minor cleanup.

---
 security/nss/lib/crmf/challcli.c     | 1 +
 security/nss/lib/crmf/respcmn.c      | 1 +
 security/nss/lib/crmf/servget.c      | 1 +
 security/nss/lib/cryptohi/seckey.c   | 2 +-
 security/nss/lib/pk11wrap/pk11cert.c | 4 ++--
 security/nss/lib/pkcs7/p7create.c    | 3 ++-
 security/nss/lib/smime/cmssiginfo.c  | 3 ++-
 7 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/security/nss/lib/crmf/challcli.c b/security/nss/lib/crmf/challcli.c
index 08702eb2e7a..bf385609a1c 100644
--- a/security/nss/lib/crmf/challcli.c
+++ b/security/nss/lib/crmf/challcli.c
@@ -36,6 +36,7 @@
 #include "cmmfi.h"
 #include "secitem.h"
 #include "pk11func.h"
+#include "secder.h"
 
 CMMFPOPODecKeyChallContent*
 CMMF_CreatePOPODecKeyChallContentFromDER(const char *buf, long len)
diff --git a/security/nss/lib/crmf/respcmn.c b/security/nss/lib/crmf/respcmn.c
index f40e5b334d6..66d55a9c317 100644
--- a/security/nss/lib/crmf/respcmn.c
+++ b/security/nss/lib/crmf/respcmn.c
@@ -36,6 +36,7 @@
 #include "cmmf.h"
 #include "cmmfi.h"
 #include "secitem.h"
+#include "secder.h"
 
 SECStatus 
 cmmf_DestroyPKIStatusInfo (CMMFPKIStatusInfo *info, PRBool freeit)
diff --git a/security/nss/lib/crmf/servget.c b/security/nss/lib/crmf/servget.c
index b80454494fc..7b863d33796 100644
--- a/security/nss/lib/crmf/servget.c
+++ b/security/nss/lib/crmf/servget.c
@@ -37,6 +37,7 @@
 #include "cmmfi.h"
 #include "secitem.h"
 #include "keyhi.h"
+#include "secder.h"
 
 CRMFEncryptedKeyChoice
 CRMF_EncryptedKeyGetChoice(CRMFEncryptedKey *inEncrKey)
diff --git a/security/nss/lib/cryptohi/seckey.c b/security/nss/lib/cryptohi/seckey.c
index 8262ad159db..76c4b8ef41f 100644
--- a/security/nss/lib/cryptohi/seckey.c
+++ b/security/nss/lib/cryptohi/seckey.c
@@ -227,7 +227,7 @@ SECKEY_KEASetParams(KEAParams * params, SECKEYPublicKey * pubKey) {
 	/* the key has no KEA parameters */
 	return SECFailure;
     }
-
+    return SECSuccess;
 }
 
 
diff --git a/security/nss/lib/pk11wrap/pk11cert.c b/security/nss/lib/pk11wrap/pk11cert.c
index d515cedddce..b684dca15f9 100644
--- a/security/nss/lib/pk11wrap/pk11cert.c
+++ b/security/nss/lib/pk11wrap/pk11cert.c
@@ -1879,7 +1879,7 @@ PK11_FindCertAndKeyByRecipientListNew(NSSCMSRecipient **recipientlist, void *win
 
     certHandle = pk11_AllFindCertObjectByRecipientNew(recipientlist, wincx, &rlIndex);
     if (certHandle == CK_INVALID_KEY) {
-	return NULL;
+	return -1;
     }
 
     rl = recipientlist[rlIndex];
@@ -1915,7 +1915,7 @@ PK11_FindCertAndKeyByRecipientListNew(NSSCMSRecipient **recipientlist, void *win
 	SECKEY_DestroyPrivateKey(rl->privkey);
 	rl->slot = NULL;
 	rl->privkey = NULL;
-	return NULL;
+	return -1;
     }
     return rlIndex;
 }
diff --git a/security/nss/lib/pkcs7/p7create.c b/security/nss/lib/pkcs7/p7create.c
index 868099e6497..8e70c4d0e57 100644
--- a/security/nss/lib/pkcs7/p7create.c
+++ b/security/nss/lib/pkcs7/p7create.c
@@ -34,7 +34,7 @@
 /*
  * PKCS7 creation.
  *
- * $Id: p7create.c,v 1.1 2000-03-31 19:16:04 relyea%netscape.com Exp $
+ * $Id: p7create.c,v 1.2 2001-01-07 07:56:33 nelsonb%netscape.com Exp $
  */
 
 #include "p7local.h"
@@ -47,6 +47,7 @@
 #include "pk11func.h"
 #include "prtime.h"
 #include "secerr.h"
+#include "secder.h"
 
 static SECStatus
 sec_pkcs7_init_content_info (SEC_PKCS7ContentInfo *cinfo, PRArenaPool *poolp,
diff --git a/security/nss/lib/smime/cmssiginfo.c b/security/nss/lib/smime/cmssiginfo.c
index 608fb7be872..3529ddbca6d 100644
--- a/security/nss/lib/smime/cmssiginfo.c
+++ b/security/nss/lib/smime/cmssiginfo.c
@@ -34,7 +34,7 @@
 /*
  * CMS signerInfo methods.
  *
- * $Id: cmssiginfo.c,v 1.4 2000-06-20 16:28:57 chrisk%netscape.com Exp $
+ * $Id: cmssiginfo.c,v 1.5 2001-01-07 07:56:35 nelsonb%netscape.com Exp $
  */
 
 #include "cmslocal.h"
@@ -47,6 +47,7 @@
 #include "pk11func.h"
 #include "prtime.h"
 #include "secerr.h"
+#include "secder.h"
 #include "cryptohi.h"
 
 #include "smime.h"