Fix compilier warnings on AIX, Solaris, HP, and Linux.

6 files changed, 12 insertions, 7 deletions

diff --git a/security/nss/lib/pkcs7/certread.c b/security/nss/lib/pkcs7/certread.c
index 23d3a84d4..073a9e545 100644
--- a/security/nss/lib/pkcs7/certread.c
+++ b/security/nss/lib/pkcs7/certread.c
@@ -40,7 +40,7 @@
 #include "secasn1.h"
 #include "secoid.h"
 
-SEC_ASN1_MKSUB(SEC_AnyTemplate);
+SEC_ASN1_MKSUB(SEC_AnyTemplate)
 
 SECStatus
 SEC_ReadPKCS7Certs(SECItem *pkcs7Item, CERTImportCertificateFunc f, void *arg)
diff --git a/security/nss/lib/pkcs7/p7common.c b/security/nss/lib/pkcs7/p7common.c
index e11a7f586..8bab3685f 100644
--- a/security/nss/lib/pkcs7/p7common.c
+++ b/security/nss/lib/pkcs7/p7common.c
@@ -43,7 +43,6 @@
 #include "cert.h"
 #include "secitem.h"
 #include "secoid.h"
-#include "secpkcs5.h"
 #include "pk11func.h"
 
 /*
diff --git a/security/nss/lib/pkcs7/p7create.c b/security/nss/lib/pkcs7/p7create.c
index e9756aaec..47bdee60c 100644
--- a/security/nss/lib/pkcs7/p7create.c
+++ b/security/nss/lib/pkcs7/p7create.c
@@ -43,7 +43,6 @@
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
-#include "secpkcs5.h"
 #include "pk11func.h"
 #include "prtime.h"
 #include "secerr.h"
diff --git a/security/nss/lib/pkcs7/p7decode.c b/security/nss/lib/pkcs7/p7decode.c
index ced36fb2d..a6c47bbc1 100644
--- a/security/nss/lib/pkcs7/p7decode.c
+++ b/security/nss/lib/pkcs7/p7decode.c
@@ -58,6 +58,7 @@
 #include "secerr.h"
 #include "sechash.h"	/* for HASH_GetHashObject() */
 #include "secder.h"
+#include "secpkcs5.h"
 
 struct sec_pkcs7_decoder_worker {
     int depth;
@@ -461,7 +462,7 @@ sec_pkcs7_decoder_get_recipient_key (SEC_PKCS7DecoderContext *p7dcx,
     PK11SymKey *bulkkey;
     SECOidTag keyalgtag, bulkalgtag, encalgtag;
     PK11SlotInfo *slot;
-    int i, bulkLength = 0;
+    int bulkLength = 0;
 
     if (recipientinfos == NULL || recipientinfos[0] == NULL) {
 	p7dcx->error = SEC_ERROR_NOT_A_RECIPIENT;
diff --git a/security/nss/lib/pkcs7/p7encode.c b/security/nss/lib/pkcs7/p7encode.c
index e3c437c0d..c38026a56 100644
--- a/security/nss/lib/pkcs7/p7encode.c
+++ b/security/nss/lib/pkcs7/p7encode.c
@@ -234,7 +234,7 @@ sec_pkcs7_encoder_start_encrypt (SEC_PKCS7ContentInfo *cinfo,
 		PK11SymKey *tek;
 		CERTCertificate *ourCert;
 		SECKEYPublicKey *ourPubKey;
-		SECKEATemplateSelector whichKEA;
+		SECKEATemplateSelector whichKEA = SECKEAInvalid;
 
 		/* We really want to show our KEA tag as the
 		   key exchange algorithm tag. */
@@ -357,6 +357,8 @@ sec_pkcs7_encoder_start_encrypt (SEC_PKCS7ContentInfo *cinfo,
 		if (err != SECSuccess)
 		    goto loser;
 
+		PORT_Assert( whichKEA != SECKEAInvalid);
+
 		/* Encode the KEA parameters into the recipient info. */
 		params = SEC_ASN1EncodeItem(arena,NULL, &keaParams, 
 				      sec_pkcs7_get_kea_template(whichKEA));
diff --git a/security/nss/lib/pkcs7/pkcs7t.h b/security/nss/lib/pkcs7/pkcs7t.h
index a3e974f7b..251d917b7 100644
--- a/security/nss/lib/pkcs7/pkcs7t.h
+++ b/security/nss/lib/pkcs7/pkcs7t.h
@@ -51,6 +51,10 @@
 typedef struct SEC_PKCS7DecoderContextStr SEC_PKCS7DecoderContext;
 typedef struct SEC_PKCS7EncoderContextStr SEC_PKCS7EncoderContext;
 
+/* legacy defines that haven't been active for years */
+typedef void *(*SECKEYGetPasswordKey)(void *arg, void *handle);
+
+
 /* Non-opaque objects.  NOTE, though: I want them to be treated as
  * opaque as much as possible.  If I could hide them completely,
  * I would.  (I tried, but ran into trouble that was taking me too
@@ -100,7 +104,6 @@ typedef struct SEC_PKCS7SMIMEKEAParametersStr SEC_PKCS7SMIMEKEAParameters;
  */
 typedef struct SEC_PKCS7AttributeStr SEC_PKCS7Attribute;
 
-
 struct SEC_PKCS7ContentInfoStr {
     PRArenaPool *poolp;			/* local; not part of encoding */
     PRBool created;			/* local; not part of encoding */
@@ -223,7 +226,8 @@ typedef enum
 {
 	SECKEAUsesSkipjack = 0,
 	SECKEAUsesNonSkipjack = 1,
-	SECKEAUsesNonSkipjackWithPaddedEncKey = 2
+	SECKEAUsesNonSkipjackWithPaddedEncKey = 2,
+	SECKEAInvalid = -1
 } SECKEATemplateSelector;
 
 /* ### mwelch - S/MIME KEA parameters. These don't really fit here,