Bugs 166734 and 166785: fixed compiler warnings reported by gcc on Linux.

The patch for this checkin is attached to bug 166785.

34 files changed, 36 insertions, 111 deletions

diff --git a/security/nss/cmd/lib/secutil.c b/security/nss/cmd/lib/secutil.c
index 818176904..65f1cb4cb 100644
--- a/security/nss/cmd/lib/secutil.c
+++ b/security/nss/cmd/lib/secutil.c
@@ -684,7 +684,7 @@ static void secu_Newline(FILE *out)
 }
 
 void
-SECU_PrintAsHex(FILE *out, SECItem *data, char *m, int level)
+SECU_PrintAsHex(FILE *out, SECItem *data, const char *m, int level)
 {
     unsigned i;
     int column;
@@ -1931,7 +1931,8 @@ SECU_PrintCRLInfo(FILE *out, CERTCrl *crl, char *m, int level)
 **   Pretty print a PKCS7 signed data type (up to version 1).
 */
 static int
-secu_PrintPKCS7Signed(FILE *out, SEC_PKCS7SignedData *src, char *m, int level)
+secu_PrintPKCS7Signed(FILE *out, SEC_PKCS7SignedData *src,
+		      const char *m, int level)
 {
     SECAlgorithmID *digAlg;		/* digest algorithms */
     SECItem *aCert;			/* certificate */
@@ -2010,7 +2011,7 @@ secu_PrintPKCS7Signed(FILE *out, SEC_PKCS7SignedData *src, char *m, int level)
 */
 static void
 secu_PrintPKCS7Enveloped(FILE *out, SEC_PKCS7EnvelopedData *src,
-			 char *m, int level)
+			 const char *m, int level)
 {
     SEC_PKCS7RecipientInfo *recInfo;   /* pointer for signer information */
     int iv;
@@ -2041,7 +2042,7 @@ secu_PrintPKCS7Enveloped(FILE *out, SEC_PKCS7EnvelopedData *src,
 static int
 secu_PrintPKCS7SignedAndEnveloped(FILE *out,
 				  SEC_PKCS7SignedAndEnvelopedData *src,
-				  char *m, int level)
+				  const char *m, int level)
 {
     SECAlgorithmID *digAlg;  /* pointer for digest algorithms */
     SECItem *aCert;           /* pointer for certificate */
@@ -2161,7 +2162,7 @@ SECU_PrintCrl (FILE *out, SECItem *der, char *m, int level)
 */
 static void
 secu_PrintPKCS7Encrypted(FILE *out, SEC_PKCS7EncryptedData *src,
-			 char *m, int level)
+			 const char *m, int level)
 {
     SECU_Indent(out, level); fprintf(out, "%s:\n", m);
     SECU_PrintInteger(out, &(src->version), "Version", level + 1);
@@ -2176,7 +2177,7 @@ secu_PrintPKCS7Encrypted(FILE *out, SEC_PKCS7EncryptedData *src,
 */
 static void
 secu_PrintPKCS7Digested(FILE *out, SEC_PKCS7DigestedData *src,
-			char *m, int level)
+			const char *m, int level)
 {
     SECU_Indent(out, level); fprintf(out, "%s:\n", m);
     SECU_PrintInteger(out, &(src->version), "Version", level + 1);
@@ -2197,7 +2198,7 @@ static int
 secu_PrintPKCS7ContentInfo(FILE *out, SEC_PKCS7ContentInfo *src,
 			   char *m, int level)
 {
-    char *desc;
+    const char *desc;
     SECOidTag kind;
     int rv;
 
@@ -2590,7 +2591,6 @@ void
 SECU_PrintPRandOSError(char *progName) 
 {
     char buffer[513];
-    PRErrorCode err    = PR_GetError();
     PRInt32     errLen = PR_GetErrorTextLength();
     if (errLen > 0 && errLen < sizeof buffer) {
         PR_GetErrorText(buffer);
diff --git a/security/nss/cmd/lib/secutil.h b/security/nss/cmd/lib/secutil.h
index e2db2f4c8..69d9865d3 100644
--- a/security/nss/cmd/lib/secutil.h
+++ b/security/nss/cmd/lib/secutil.h
@@ -183,7 +183,7 @@ extern void SECU_PrintAlgorithmID(FILE *out, SECAlgorithmID *a, char *m,
 				  int level);
 
 /* Print SECItem as hex */
-extern void SECU_PrintAsHex(FILE *out, SECItem *i, char *m, int level);
+extern void SECU_PrintAsHex(FILE *out, SECItem *i, const char *m, int level);
 
 /* dump a buffer in hex and ASCII */
 extern void SECU_PrintBuf(FILE *out, const char *msg, const void *vp, int len);
diff --git a/security/nss/cmd/modutil/install.c b/security/nss/cmd/modutil/install.c
index 452b70f01..c6f55be01 100644
--- a/security/nss/cmd/modutil/install.c
+++ b/security/nss/cmd/modutil/install.c
@@ -40,6 +40,12 @@
 #include <prsystem.h>
 #include <prproces.h>
 
+#ifdef XP_UNIX
+/* for chmod */
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+
 /*extern "C" {*/
 #include <jar.h>
 /*}*/
diff --git a/security/nss/cmd/pk12util/pk12util.c b/security/nss/cmd/pk12util/pk12util.c
index 1a6163aab..95a51422a 100644
--- a/security/nss/cmd/pk12util/pk12util.c
+++ b/security/nss/cmd/pk12util/pk12util.c
@@ -558,9 +558,8 @@ P12U_ExportPKCS12Object(char *nn, char *outfile, PK11SlotInfo *inSlot,
     SEC_PKCS12ExportContext *p12ecx = NULL;
     SEC_PKCS12SafeInfo *keySafe = NULL, *certSafe = NULL;
     SECItem *pwitem = NULL;
-    PK11SlotInfo *slot = NULL;
     p12uContext *p12cxt = NULL;
-    CERTCertificate *cert;
+    CERTCertificate *cert = NULL;
 
     if (P12U_InitSlot(inSlot, slotPw) != SECSuccess) {
 	SECU_PrintError(progName,"Failed to authenticate to \"%s\"",
@@ -641,9 +640,6 @@ P12U_ExportPKCS12Object(char *nn, char *outfile, PK11SlotInfo *inSlot,
     p12u_DestroyExportFileInfo(&p12cxt, PR_FALSE);
     SECITEM_ZfreeItem(pwitem, PR_TRUE);
     CERT_DestroyCertificate(cert);
-    if(slot) {
-	PK11_FreeSlot(slot);
-    }
 
     fprintf(stdout, "%s: PKCS12 EXPORT SUCCESSFUL\n", progName);
     SEC_PKCS12DestroyExportContext(p12ecx);
@@ -659,9 +655,6 @@ loser:
     if (p12FilePw)
 	PR_Free(p12FilePw->data);
 
-    if(slot && (slot != cert->slot)) {
-	PK11_FreeSlot(slot);
-    }
     if(cert) {
 	CERT_DestroyCertificate(cert);
     }
diff --git a/security/nss/cmd/sdrtest/sdrtest.c b/security/nss/cmd/sdrtest/sdrtest.c
index 9578b3472..5f82ff880 100644
--- a/security/nss/cmd/sdrtest/sdrtest.c
+++ b/security/nss/cmd/sdrtest/sdrtest.c
@@ -100,7 +100,6 @@ main (int argc, char **argv)
 {
     int		 retval = 0;  /* 0 - test succeeded.  -1 - test failed */
     SECStatus	 rv;
-    const char	*certDir = ".";
     PLOptState	*optstate;
     char	*program_name;
     const char  *input_file = NULL; 	/* read encrypted data from here (or create) */
@@ -236,7 +235,6 @@ file_loser:
       }
       if (slot) {
 	PK11_FreeSlot(slot);
-	slot == NULL;
       }
 
       rv = PK11SDR_Encrypt(&keyid, &data, &result, 0);
diff --git a/security/nss/cmd/smimetools/cmsutil.c b/security/nss/cmd/smimetools/cmsutil.c
index d0ac0402a..6dbb6edff 100644
--- a/security/nss/cmd/smimetools/cmsutil.c
+++ b/security/nss/cmd/smimetools/cmsutil.c
@@ -47,6 +47,7 @@
 #include "cms.h"
 #include "nss.h"
 #include "smime.h"
+#include "pk11func.h"
 
 #if defined(XP_UNIX)
 #include <unistd.h>
@@ -195,7 +196,7 @@ struct encryptOptionsStr {
 
 static NSSCMSMessage *
 decode(FILE *out, SECItem *output, SECItem *input, 
-       struct decodeOptionsStr *decodeOptions)
+       const struct decodeOptionsStr *decodeOptions)
 {
     NSSCMSDecoderContext *dcx;
     NSSCMSMessage *cmsg;
diff --git a/security/nss/cmd/ssltap/ssltap.c b/security/nss/cmd/ssltap/ssltap.c
index dbf5161b8..daca2949f 100644
--- a/security/nss/cmd/ssltap/ssltap.c
+++ b/security/nss/cmd/ssltap/ssltap.c
@@ -347,18 +347,12 @@ void partial_packet(int thispacket, int size, int needed)
 
 char * get_time_string(void)
 {
-  struct tm *tm;
   char      *cp;
   char      *eol;
   time_t     tt;
 
   time(&tt);
-#if 0
-  tm = localtime(&tt);
-  cp = asctime(tm);
-#else
   cp = ctime(&tt);
-#endif
   eol = strchr(cp, '\n');
   if (eol) 
     *eol = 0;
@@ -1060,7 +1054,7 @@ showErr(const char * msg) {
 
 int main(int argc,  char *argv[])
 {
-  char *hostname;
+  char *hostname=NULL;
   PRUint16 rendport=DEFPORT,port;
   PRHostEnt hp;
   PRStatus r;
diff --git a/security/nss/cmd/swfort/instinit/instinit.c b/security/nss/cmd/swfort/instinit/instinit.c
index dcc9e3245..8b8b86c81 100644
--- a/security/nss/cmd/swfort/instinit/instinit.c
+++ b/security/nss/cmd/swfort/instinit/instinit.c
@@ -148,7 +148,7 @@ usage(char *prog) {
    exit(1);
 }
 	
-main(int argc, char ** argv)
+int main(int argc, char ** argv)
 {
 
     FORTSignedSWFile * swfile;
@@ -166,7 +166,6 @@ main(int argc, char ** argv)
     char * pass;
     SECStatus rv;
     int i;
-    SECMODModule *module;
     int64 now; /* XXXX */
     char *issuer;
     char *transport_pass = NULL;
diff --git a/security/nss/lib/certdb/alg1485.c b/security/nss/lib/certdb/alg1485.c
index 9bd248640..fe1b4913e 100644
--- a/security/nss/lib/certdb/alg1485.c
+++ b/security/nss/lib/certdb/alg1485.c
@@ -717,8 +717,6 @@ CERT_NameToAscii(CERTName *name)
     CERTAVA** avas;
     CERTAVA* ava;
     PRBool first = PR_TRUE;
-    char *buf = NULL;
-    unsigned buflen = 0;
     stringBuf strBuf = { NULL, 0, 0 };
     
     rdns = name->rdns;
@@ -836,7 +834,6 @@ char *
 CERT_GetCertificateEmailAddress(CERTCertificate *cert)
 {
     char *rawEmailAddr = NULL;
-    char *emailAddr = NULL;
     SECItem subAltName;
     SECStatus rv;
     CERTGeneralName *nameList = NULL;
diff --git a/security/nss/lib/certdb/crl.c b/security/nss/lib/certdb/crl.c
index f21a3ba73..bf1e56e20 100644
--- a/security/nss/lib/certdb/crl.c
+++ b/security/nss/lib/certdb/crl.c
@@ -1055,7 +1055,6 @@ PRBool CRLStillExists(CERTSignedCrl* crl)
     CK_ULONG crl_class;
     PRStatus status;
     PK11SlotInfo* slot = NULL;
-    NSSToken* token = NULL;
     nssCryptokiObject instance;
     NSSArena* arena;
     PRBool xstatus = PR_TRUE;
@@ -1391,9 +1390,6 @@ SECStatus DPCache_Update(CRLDPCache* cache, CERTCertificate* issuer, int64 t,
 SECStatus DPCache_Initialize(CRLDPCache* cache, CERTCertificate* issuer,
                              SECItem* subject, SECItem* dp)
 {
-    CK_OBJECT_HANDLE crloid = 0;
-    SECItem* crlder = NULL;
-
     PORT_Assert(cache);
     if (!cache) {
         return SECFailure;
diff --git a/security/nss/lib/certhigh/certhigh.c b/security/nss/lib/certhigh/certhigh.c
index 6c8831aae..f5262851b 100644
--- a/security/nss/lib/certhigh/certhigh.c
+++ b/security/nss/lib/certhigh/certhigh.c
@@ -388,8 +388,10 @@ CollectNicknames( NSSCertificate *c, void *data)
     PRBool saveit = PR_FALSE;
     stringNode *node;
     int len;
+#ifdef notdef
     NSSTrustDomain *td;
     NSSTrust *trust;
+#endif
     char *stanNickname;
     char *nickname = NULL;
     
diff --git a/security/nss/lib/certhigh/certvfy.c b/security/nss/lib/certhigh/certvfy.c
index 95d2cd37b..a3ef430fc 100644
--- a/security/nss/lib/certhigh/certvfy.c
+++ b/security/nss/lib/certhigh/certvfy.c
@@ -1192,8 +1192,6 @@ CERT_VerifyCertificate(CERTCertDBHandle *handle, CERTCertificate *cert,
     PRBool checkedChain = PR_FALSE;
     PRInt32 i;
     SECCertUsage certUsage = 0;
-    PRBool doOCSP = PR_FALSE;
-    PRBool checkedCRL = PR_FALSE;
     PRBool checkedOCSP = PR_FALSE;
     PRBool checkAllUsages = PR_FALSE;
     PRBool revoked = PR_FALSE;
diff --git a/security/nss/lib/ckfw/builtins/nssckbi.h b/security/nss/lib/ckfw/builtins/nssckbi.h
index 844c78d1c..c18c01c9c 100644
--- a/security/nss/lib/ckfw/builtins/nssckbi.h
+++ b/security/nss/lib/ckfw/builtins/nssckbi.h
@@ -61,4 +61,4 @@
 #define NSS_BUILTINS_FIRMWARE_VERSION_MAJOR 1
 #define NSS_BUILTINS_FIRMWARE_VERSION_MINOR 0
 
-#endif NSSCKBI_H
+#endif /* NSSCKBI_H */
diff --git a/security/nss/lib/ckfw/find.c b/security/nss/lib/ckfw/find.c
index 2569fa100..9f8a22a31 100644
--- a/security/nss/lib/ckfw/find.c
+++ b/security/nss/lib/ckfw/find.c
@@ -135,7 +135,6 @@ nssCKFWFindObjects_Create
 )
 {
   NSSCKFWFindObjects *fwFindObjects = NULL;
-  NSSArena *arena;
   NSSCKMDSession *mdSession;
   NSSCKMDToken *mdToken;
   NSSCKMDInstance *mdInstance;
@@ -144,13 +143,6 @@ nssCKFWFindObjects_Create
   mdToken = nssCKFWToken_GetMDToken(fwToken);
   mdInstance = nssCKFWInstance_GetMDInstance(fwInstance);
 
-#ifdef notdef
-  arena = nssCKFWSession_GetArena(fwSession, pError);
-  if( (NSSArena *)NULL == arena ) {
-    goto loser;
-  }
-#endif
-
   fwFindObjects = nss_ZNEW(NULL, NSSCKFWFindObjects);
   if( (NSSCKFWFindObjects *)NULL == fwFindObjects ) {
     *pError = CKR_HOST_MEMORY;
diff --git a/security/nss/lib/ckfw/wrap.c b/security/nss/lib/ckfw/wrap.c
index 3dc29ed01..08ad62baf 100644
--- a/security/nss/lib/ckfw/wrap.c
+++ b/security/nss/lib/ckfw/wrap.c
@@ -2500,7 +2500,6 @@ NSSCKFWC_FindObjects
   NSSCKFWSession *fwSession;
   NSSCKFWFindObjects *fwFindObjects;
   CK_ULONG i;
-  NSSArena *arena;
 
   if( (NSSCKFWInstance *)NULL == fwInstance ) {
     error = CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -2513,13 +2512,6 @@ NSSCKFWC_FindObjects
     goto loser;
   }
 
-#ifdef notdef
-  arena = nssCKFWSession_GetArena(fwSession, &error);
-  if( (NSSArena *)NULL == arena ) {
-    goto loser;
-  }
-#endif
-
   if( (CK_OBJECT_HANDLE_PTR)CK_NULL_PTR == phObject ) {
     error = CKR_ARGUMENTS_BAD;
     goto loser;
diff --git a/security/nss/lib/dev/devslot.c b/security/nss/lib/dev/devslot.c
index ad53ca83e..81cd512d5 100644
--- a/security/nss/lib/dev/devslot.c
+++ b/security/nss/lib/dev/devslot.c
@@ -91,6 +91,7 @@ static PRIntervalTime s_token_delay_time = 0;
 /* The flags needed to open a read-only session. */
 static const CK_FLAGS s_ck_readonly_flags = CKF_SERIAL_SESSION;
 
+#ifdef PURE_STAN_BUILD
 /* In pk11slot.c, this was a no-op.  So it is here also. */
 static CK_RV PR_CALLBACK
 nss_ck_slot_notify
@@ -103,7 +104,6 @@ nss_ck_slot_notify
     return CKR_OK;
 }
 
-#ifdef PURE_STAN_BUILD
 NSS_IMPLEMENT NSSSlot *
 nssSlot_Create
 (
diff --git a/security/nss/lib/fortcrypt/swfort/swfparse.c b/security/nss/lib/fortcrypt/swfort/swfparse.c
index 7e6d14032..30672c73d 100644
--- a/security/nss/lib/fortcrypt/swfort/swfparse.c
+++ b/security/nss/lib/fortcrypt/swfort/swfparse.c
@@ -334,7 +334,7 @@ FORT_GetSWFile(SECItem *initBits)
 
     /* copy the DER into the arena, since Quick DER returns data that points
        into the DER input, which may get freed by the caller */
-    rv = SECITEM_CopyItem(arena, &newInitBits, &initBits);
+    rv = SECITEM_CopyItem(arena, &newInitBits, initBits);
     if ( rv != SECSuccess ) {
         goto fail;
     }
diff --git a/security/nss/lib/pk11wrap/pk11cert.c b/security/nss/lib/pk11wrap/pk11cert.c
index ff99808f7..9919b19c6 100644
--- a/security/nss/lib/pk11wrap/pk11cert.c
+++ b/security/nss/lib/pk11wrap/pk11cert.c
@@ -792,6 +792,7 @@ typedef struct pk11DoCertCallbackStr {
 	void *callbackArg;
 } pk11DoCertCallback;
 
+#ifdef NSS_CLASSIC
 /*
  * callback to map object handles to certificate structures.
  */
@@ -823,6 +824,7 @@ pk11_DoCerts(PK11SlotInfo *slot, CK_OBJECT_HANDLE certID, void *arg)
 	    
     return SECSuccess;
 }
+#endif
 
 static SECStatus
 pk11_CollectCrls(PK11SlotInfo *slot, CK_OBJECT_HANDLE crlID, void *arg)
@@ -2264,8 +2266,6 @@ PK11_FindCertAndKeyByRecipientList(PK11SlotInfo **slotPtr,
 	SEC_PKCS7RecipientInfo **array, SEC_PKCS7RecipientInfo **rip,
 				SECKEYPrivateKey**privKey, void *wincx)
 {
-    CK_OBJECT_HANDLE certHandle = CK_INVALID_HANDLE;
-    CK_OBJECT_HANDLE keyHandle = CK_INVALID_HANDLE;
     CERTCertificate *cert = NULL;
     SECStatus rv;
 
diff --git a/security/nss/lib/pk11wrap/pk11load.c b/security/nss/lib/pk11wrap/pk11load.c
index 65c61c15e..f9ff7d506 100644
--- a/security/nss/lib/pk11wrap/pk11load.c
+++ b/security/nss/lib/pk11wrap/pk11load.c
@@ -46,13 +46,13 @@ extern void FC_GetFunctionList(void);
 extern void NSC_GetFunctionList(void);
 extern void NSC_ModuleDBFunc(void);
 
-static char *modToDBG = NULL;
-
 #ifdef DEBUG
 #define DEBUG_MODULE 1
 #endif
 
 #ifdef DEBUG_MODULE
+static char *modToDBG = NULL;
+
 #include "debug_module.c"
 #endif
 
diff --git a/security/nss/lib/pk11wrap/pk11pqg.c b/security/nss/lib/pk11wrap/pk11pqg.c
index f58fd60cb..a779d6c74 100644
--- a/security/nss/lib/pk11wrap/pk11pqg.c
+++ b/security/nss/lib/pk11wrap/pk11pqg.c
@@ -58,7 +58,6 @@ PK11_PQG_ParamGenSeedLen( unsigned int j, unsigned int seedBytes,
     CK_MECHANISM mechanism;
     CK_OBJECT_HANDLE objectID = CK_INVALID_HANDLE;
     CK_RV crv;
-    CK_BBOOL cktrue = CK_TRUE;
     CK_ATTRIBUTE pTemplate[] = {
 	{ CKA_PRIME, NULL, 0 },
 	{ CKA_SUBPRIME, NULL, 0 },
diff --git a/security/nss/lib/pk11wrap/pk11slot.c b/security/nss/lib/pk11wrap/pk11slot.c
index 0a92f2105..ac99b8a75 100644
--- a/security/nss/lib/pk11wrap/pk11slot.c
+++ b/security/nss/lib/pk11wrap/pk11slot.c
@@ -536,7 +536,6 @@ SECMOD_HasRootCerts(void)
    SECMODModuleList *modules = SECMOD_GetDefaultModuleList();
    SECMODListLock *moduleLock = SECMOD_GetDefaultModuleListLock();
    int i;
-   PK11SlotInfo *slot = NULL;
    PRBool found = PR_FALSE;
 
    /* work through all the slots */
diff --git a/security/nss/lib/pk11wrap/pk11util.c b/security/nss/lib/pk11wrap/pk11util.c
index d620bb8e0..063314d7f 100644
--- a/security/nss/lib/pk11wrap/pk11util.c
+++ b/security/nss/lib/pk11wrap/pk11util.c
@@ -708,5 +708,5 @@ SECMOD_DestroyModuleList(SECMODModuleList *list) {
 PRBool
 SECMOD_CanDeleteInternalModule(void)
 {
-    return (PRBool) pendingModule == NULL;
+    return (PRBool) (pendingModule == NULL);
 }
diff --git a/security/nss/lib/pkcs12/p12d.c b/security/nss/lib/pkcs12/p12d.c
index 77e83a6fd..c05f9af40 100644
--- a/security/nss/lib/pkcs12/p12d.c
+++ b/security/nss/lib/pkcs12/p12d.c
@@ -2223,7 +2223,7 @@ sec_pkcs12_validate_cert(sec_PKCS12SafeBag *cert,
 			 SEC_PKCS12NicknameCollisionCallback nicknameCb,
 			 void *wincx)
 {
-    CERTCertificate *leafCert, *testCert;
+    CERTCertificate *leafCert;
 
     if(!cert) {
 	return;
diff --git a/security/nss/lib/pki/certificate.c b/security/nss/lib/pki/certificate.c
index b763412c4..00b1b41e2 100644
--- a/security/nss/lib/pki/certificate.c
+++ b/security/nss/lib/pki/certificate.c
@@ -301,7 +301,6 @@ filter_subject_certs_for_id
 )
 {
     NSSCertificate **si;
-    NSSCertificate *rvCert = NULL;
     nssDecodedCert *dcp;
     int nextOpenSlot = 0;
 
diff --git a/security/nss/lib/softoken/dbinit.c b/security/nss/lib/softoken/dbinit.c
index 02f7fc567..40e295eaa 100644
--- a/security/nss/lib/softoken/dbinit.c
+++ b/security/nss/lib/softoken/dbinit.c
@@ -273,7 +273,6 @@ pk11_DBShutdown(NSSLOWCERTCertDBHandle *certHandle,
 
 static int rdbmapflags(int flags);
 static rdbfunc pk11_rdbfunc;
-static void *pk11_tnx;
 
 /* NOTE: SHLIB_SUFFIX is defined on the command line */
 #define RDBLIB "rdb."SHLIB_SUFFIX
diff --git a/security/nss/lib/softoken/dbmshim.c b/security/nss/lib/softoken/dbmshim.c
index 8a95eb2b6..a422c1b5f 100644
--- a/security/nss/lib/softoken/dbmshim.c
+++ b/security/nss/lib/softoken/dbmshim.c
@@ -47,7 +47,8 @@
 #include "pcertt.h"
 #include "secasn1.h"
 #include "secerr.h"
-#include "base64.h"
+#include "nssb64.h"
+#include "blapi.h"
 #include "sechash.h"
 
 #include "pkcs11i.h"
@@ -446,7 +447,6 @@ dbs_put(const DB *dbs, DBT *key, const DBT *data, unsigned int flags)
 static int
 dbs_sync(const DB *dbs, unsigned int flags)
 {
-    int ret;
     DB *db = (DB *)dbs->internal;
 
     dbs_freemap();
@@ -457,7 +457,6 @@ dbs_sync(const DB *dbs, unsigned int flags)
 static int
 dbs_del(const DB *dbs, const DBT *key, unsigned int flags)
 {
-    PRStatus prstat;
     int ret;
     DBS *dbsp = (DBS *)dbs;
     DB *db = (DB *)dbs->internal;
@@ -478,7 +477,6 @@ dbs_del(const DB *dbs, const DBT *key, unsigned int flags)
 static int
 dbs_seq(const DB *dbs, DBT *key, DBT *data, unsigned int flags)
 {
-    PRStatus prstat;
     int ret;
     DBS *dbsp = (DBS *)dbs;
     DB *db = (DB *)dbs->internal;
diff --git a/security/nss/lib/softoken/keydb.c b/security/nss/lib/softoken/keydb.c
index f6b1a19a9..a8c1f1af5 100644
--- a/security/nss/lib/softoken/keydb.c
+++ b/security/nss/lib/softoken/keydb.c
@@ -541,12 +541,6 @@ makeGlobalSalt(NSSLOWKEYDBHandle *handle)
     return(SECSuccess);
 }
 
-static char *
-keyDBFilenameCallback(void *arg, int dbVersion)
-{
-    return(PORT_Strdup((char *)arg));
-}
-
 static SECStatus
 ChangeKeyDBPasswordAlg(NSSLOWKEYDBHandle *handle,
 		       SECItem *oldpwitem, SECItem *newpwitem,
diff --git a/security/nss/lib/softoken/pcertdb.c b/security/nss/lib/softoken/pcertdb.c
index 45a22397e..6358fa4e2 100644
--- a/security/nss/lib/softoken/pcertdb.c
+++ b/security/nss/lib/softoken/pcertdb.c
@@ -1039,7 +1039,6 @@ CreateCertEntry(void)
 static certDBEntryCert *
 ReadDBCertEntry(NSSLOWCERTCertDBHandle *handle, SECItem *certKey)
 {
-    PRArenaPool *arena = NULL;
     certDBEntryCert *entry;
     SECItem dbkey;
     SECItem dbentry;
@@ -3749,8 +3748,6 @@ openNewCertDB(const char *appName, const char *prefix, const char *certdbname,
     certDBEntryVersion *versionEntry = NULL;
     DB *updatedb = NULL;
     char *tmpname;
-    PRBool updated = PR_FALSE;
-    PRBool forceUpdate = PR_FALSE;
 
     if (appName) {
 	handle->permCertDB=rdbopen( appName, prefix, "cert", NO_CREATE);
@@ -4359,7 +4356,6 @@ static NSSLOWCERTCertificate *
 FindCertByKey(NSSLOWCERTCertDBHandle *handle, SECItem *certKey, PRBool lockdb)
 {
     NSSLOWCERTCertificate *cert = NULL;
-    PRArenaPool *arena = NULL;
     certDBEntryCert *entry;
     PRBool locked = PR_FALSE;
     
@@ -4399,7 +4395,6 @@ static NSSLOWCERTTrust *
 FindTrustByKey(NSSLOWCERTCertDBHandle *handle, SECItem *certKey, PRBool lockdb)
 {
     NSSLOWCERTTrust *trust = NULL;
-    PRArenaPool *arena = NULL;
     certDBEntryCert *entry;
     PRBool locked = PR_FALSE;
     
@@ -4791,7 +4786,6 @@ nsslowcert_FindCrlByKey(NSSLOWCERTCertDBHandle *handle,
     SECItem keyitem;
     DBT key;
     SECStatus rv;
-    SECItem *crl = NULL;
     PRArenaPool *arena = NULL;
     certDBEntryRevocation *entry = NULL;
     certDBEntryType crlType = isKRL ? certDBEntryTypeKeyRevocation  
diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c
index 1026214b7..c5825e6fb 100644
--- a/security/nss/lib/softoken/pkcs11.c
+++ b/security/nss/lib/softoken/pkcs11.c
@@ -1504,7 +1504,6 @@ pk11_handleKeyParameterObject(PK11Session *session, PK11Object *object)
 {
     PK11Attribute *attribute;
     CK_KEY_TYPE key_type;
-    CK_BBOOL cktrue = CK_TRUE;
     CK_BBOOL ckfalse = CK_FALSE;
     CK_RV crv;
 
diff --git a/security/nss/lib/softoken/pkcs11c.c b/security/nss/lib/softoken/pkcs11c.c
index 6043fa530..cc56a1041 100644
--- a/security/nss/lib/softoken/pkcs11c.c
+++ b/security/nss/lib/softoken/pkcs11c.c
@@ -845,7 +845,7 @@ CK_RV NSC_Encrypt (CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData,
     unsigned int maxoutlen = *pulEncryptedDataLen;
     CK_RV crv;
     CK_RV crv2;
-    SECStatus rv;
+    SECStatus rv = SECSuccess;
 
     /* make sure we're legal */
     crv = pk11_GetContext(hSession,&context,PK11_ENCRYPT,PR_FALSE,&session);
@@ -1003,7 +1003,7 @@ CK_RV NSC_Decrypt(CK_SESSION_HANDLE hSession,
     unsigned int maxoutlen = *pulDataLen;
     CK_RV crv;
     CK_RV crv2;
-    SECStatus rv;
+    SECStatus rv = SECSuccess;
 
     /* make sure we're legal */
     crv = pk11_GetContext(hSession,&context,PK11_DECRYPT,PR_FALSE,&session);
@@ -2129,7 +2129,7 @@ CK_RV NSC_Sign(CK_SESSION_HANDLE hSession,
     unsigned int outlen;
     unsigned int maxoutlen = *pulSignatureLen;
     CK_RV crv,crv2;
-    SECStatus rv;
+    SECStatus rv = SECSuccess;
 
     /* make sure we're legal */
     crv = pk11_GetContext(hSession,&context,PK11_SIGN,PR_FALSE,&session);
diff --git a/security/nss/lib/softoken/pkcs11u.c b/security/nss/lib/softoken/pkcs11u.c
index d8c39bd88..2e4186276 100644
--- a/security/nss/lib/softoken/pkcs11u.c
+++ b/security/nss/lib/softoken/pkcs11u.c
@@ -320,11 +320,6 @@ static const PK11Attribute pk11_StaticMustVerifyAttr =
   PK11_DEF_ATTRIBUTE(&pk11_staticMustVerifyValue,
 				sizeof(pk11_staticMustVerifyValue));
 
-static void pk11_FreeItem(SECItem *item)
-{
-    SECITEM_FreeItem(item, PR_TRUE);
-}
-
 static certDBEntrySMime *
 pk11_getSMime(PK11TokenObject *object)
 {
diff --git a/security/nss/lib/ssl/sslauth.c b/security/nss/lib/ssl/sslauth.c
index 6be86ec9b..eb1575058 100644
--- a/security/nss/lib/ssl/sslauth.c
+++ b/security/nss/lib/ssl/sslauth.c
@@ -172,7 +172,6 @@ SECStatus
 SSL_AuthCertificateHook(PRFileDesc *s, SSLAuthCertificate func, void *arg)
 {
     sslSocket *ss;
-    SECStatus rv;
 
     ss = ssl_FindSocket(s);
     if (!ss) {
@@ -193,7 +192,6 @@ SSL_GetClientAuthDataHook(PRFileDesc *s, SSLGetClientAuthData func,
 			      void *arg)
 {
     sslSocket *ss;
-    SECStatus rv;
 
     ss = ssl_FindSocket(s);
     if (!ss) {
@@ -212,7 +210,6 @@ SECStatus
 SSL_SetPKCS11PinArg(PRFileDesc *s, void *arg)
 {
     sslSocket *ss;
-    SECStatus rv;
 
     ss = ssl_FindSocket(s);
     if (!ss) {
diff --git a/security/nss/lib/ssl/sslsecur.c b/security/nss/lib/ssl/sslsecur.c
index e5c2bc136..e5b215a7d 100644
--- a/security/nss/lib/ssl/sslsecur.c
+++ b/security/nss/lib/ssl/sslsecur.c
@@ -720,8 +720,6 @@ ssl_CreateSecurityInfo(sslSocket *ss)
 SECStatus
 ssl_CopySecurityInfo(sslSocket *ss, sslSocket *os)
 {
-    int rv;
-
     ss->sec.send 		= os->sec.send;
     ss->sec.isServer 		= os->sec.isServer;
     ss->sec.keyBits    		= os->sec.keyBits;
@@ -1064,7 +1062,6 @@ SECStatus
 SSL_BadCertHook(PRFileDesc *fd, SSLBadCertHandler f, void *arg)
 {
     sslSocket *ss;
-    SECStatus rv;
     
     ss = ssl_FindSocket(fd);
     if (!ss) {
diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c
index f4d4d08d3..4d583b3d9 100644
--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@@ -262,7 +262,6 @@ static sslPID myPid;
 static PRUint32  ssl_max_sid_cache_locks = MAX_SID_CACHE_LOCKS;
 
 /* forward static function declarations */
-static void IOError(int rv, char *type);
 static PRUint32 SIDindex(cacheDesc *cache, const PRIPv6Addr *addr, PRUint8 *s, unsigned nl);
 static SECStatus LaunchLockPoller(cacheDesc *cache);
 
@@ -291,18 +290,6 @@ typedef struct inheritanceStr inheritance;
 
 /************************************************************************/
 
-static void 
-IOError(int rv, char *type)
-{
-#if defined(XP_UNIX) || defined(XP_BEOS)
-    syslog(LOG_ALERT,
-	   "SSL: %s error with session-id cache, pid=%d, rv=%d, error='%m'",
-	   type, myPid, rv);
-#else /* XP_WIN32 */
-    /* wish win32 had something like syslog() */
-#endif /* XP_UNIX */
-}
-
 static PRUint32
 LockSidCacheLock(sidCacheLock *lock, PRUint32 now)
 {