Bug 1182667 - Enable warnings as errors, r=rrelyea

23 files changed, 53 insertions, 58 deletions

diff --git a/lib/libpkix/include/pkix_certstore.h b/lib/libpkix/include/pkix_certstore.h
index 2feb3334d..fb705644e 100755
--- a/lib/libpkix/include/pkix_certstore.h
+++ b/lib/libpkix/include/pkix_certstore.h
@@ -10,6 +10,7 @@
 #define _PKIX_CERTSTORE_H
 
 #include "pkixt.h"
+#include "certt.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -327,7 +328,7 @@ typedef PKIX_Error *
         PKIX_PL_Cert *issuer,
         PKIX_PL_Date *date,
         PKIX_Boolean  crlDownloadDone,
-        PKIX_UInt32 *reasonCode,
+        CERTCRLEntryReasonCode *reasonCode,
         PKIX_RevocationStatus *revStatus,
         void *plContext);
 
diff --git a/lib/libpkix/pkix/checker/pkix_crlchecker.c b/lib/libpkix/pkix/checker/pkix_crlchecker.c
index c77ac8ef1..d6f5b6bcc 100644
--- a/lib/libpkix/pkix/checker/pkix_crlchecker.c
+++ b/lib/libpkix/pkix/checker/pkix_crlchecker.c
@@ -195,7 +195,7 @@ pkix_CrlChecker_CheckLocal(
         PKIX_UInt32 methodFlags,
         PKIX_Boolean chainVerificationState,
         PKIX_RevocationStatus *pRevStatus,
-        PKIX_UInt32 *pReasonCode,
+        CERTCRLEntryReasonCode *pReasonCode,
         void *plContext)
 {
     PKIX_CertStore_CheckRevokationByCrlCallback storeCheckRevocationFn;
@@ -294,7 +294,7 @@ pkix_CrlChecker_CheckExternal(
         PKIX_ProcessingParams *procParams,
         PKIX_UInt32 methodFlags,
         PKIX_RevocationStatus *pRevStatus,
-        PKIX_UInt32 *pReasonCode,
+        CERTCRLEntryReasonCode *pReasonCode,
         void **pNBIOContext,
         void *plContext)
 {
diff --git a/lib/libpkix/pkix/checker/pkix_crlchecker.h b/lib/libpkix/pkix/checker/pkix_crlchecker.h
index d7213aadb..35f1a4745 100644
--- a/lib/libpkix/pkix/checker/pkix_crlchecker.h
+++ b/lib/libpkix/pkix/checker/pkix_crlchecker.h
@@ -31,7 +31,7 @@ pkix_CrlChecker_CheckLocal(
         PKIX_UInt32 methodFlags,
         PKIX_Boolean chainVerificationState,
         PKIX_RevocationStatus *pRevStatus,
-        PKIX_UInt32 *reasonCode,
+        CERTCRLEntryReasonCode *reasonCode,
         void *plContext);
 
 PKIX_Error *
@@ -43,7 +43,7 @@ pkix_CrlChecker_CheckExternal(
         PKIX_ProcessingParams *procParams,
         PKIX_UInt32 methodFlags,
         PKIX_RevocationStatus *pRevStatus,
-        PKIX_UInt32 *reasonCode,
+        CERTCRLEntryReasonCode *reasonCode,
         void **pNBIOContext,
         void *plContext);
 
diff --git a/lib/libpkix/pkix/checker/pkix_ocspchecker.c b/lib/libpkix/pkix/checker/pkix_ocspchecker.c
index 481aa52b5..b6fca9a35 100644
--- a/lib/libpkix/pkix/checker/pkix_ocspchecker.c
+++ b/lib/libpkix/pkix/checker/pkix_ocspchecker.c
@@ -147,7 +147,7 @@ pkix_OcspChecker_CheckLocal(
         PKIX_UInt32 methodFlags,
         PKIX_Boolean chainVerificationState,
         PKIX_RevocationStatus *pRevStatus,
-        PKIX_UInt32 *pReasonCode,
+        CERTCRLEntryReasonCode *pReasonCode,
         void *plContext)
 {
         PKIX_PL_OcspCertID    *cid = NULL;
@@ -222,7 +222,7 @@ pkix_OcspChecker_CheckExternal(
         PKIX_ProcessingParams *procParams,
         PKIX_UInt32 methodFlags,
         PKIX_RevocationStatus *pRevStatus,
-        PKIX_UInt32 *pReasonCode,
+        CERTCRLEntryReasonCode *pReasonCode,
         void **pNBIOContext,
         void *plContext)
 {
diff --git a/lib/libpkix/pkix/checker/pkix_ocspchecker.h b/lib/libpkix/pkix/checker/pkix_ocspchecker.h
index 547b403b4..fbec315f9 100644
--- a/lib/libpkix/pkix/checker/pkix_ocspchecker.h
+++ b/lib/libpkix/pkix/checker/pkix_ocspchecker.h
@@ -30,7 +30,7 @@ pkix_OcspChecker_CheckLocal(
         PKIX_UInt32 methodFlags,
         PKIX_Boolean chainVerificationState,
         PKIX_RevocationStatus *pRevStatus,
-        PKIX_UInt32 *reasonCode,
+        CERTCRLEntryReasonCode *reasonCode,
         void *plContext);
 
 PKIX_Error *
@@ -42,7 +42,7 @@ pkix_OcspChecker_CheckExternal(
         PKIX_ProcessingParams *procParams,
         PKIX_UInt32 methodFlags,
         PKIX_RevocationStatus *pRevStatus,
-        PKIX_UInt32 *reasonCode,
+        CERTCRLEntryReasonCode *reasonCode,
         void **pNBIOContext,
         void *plContext);
 
diff --git a/lib/libpkix/pkix/checker/pkix_revocationchecker.c b/lib/libpkix/pkix/checker/pkix_revocationchecker.c
index ebe37739f..7bed9b886 100755
--- a/lib/libpkix/pkix/checker/pkix_revocationchecker.c
+++ b/lib/libpkix/pkix/checker/pkix_revocationchecker.c
@@ -349,7 +349,7 @@ PKIX_RevocationChecker_Check(
      *    first we are going to test all local(cached) info
      *    second, all remote info(fetching) */
     for (tries = 0;tries < 2;tries++) {
-        int methodNum = 0;
+        unsigned int methodNum = 0;
         for (;methodNum < revList->length;methodNum++) {
             PKIX_UInt32 methodFlags = 0;
 
@@ -372,7 +372,8 @@ PKIX_RevocationChecker_Check(
                                                methodFlags, 
                                                chainVerificationState,
                                                &revStatus,
-                                               pReasonCode, plContext),
+                                               (CERTCRLEntryReasonCode *)pReasonCode,
+                                               plContext),
                     PKIX_REVCHECKERCHECKFAILED);
                 methodStatus[methodNum] = revStatus;
                 if (revStatus == PKIX_RevStatus_Revoked) {
@@ -397,7 +398,8 @@ PKIX_RevocationChecker_Check(
                         (*method->externalRevChecker)(cert, issuer, date,
                                                       method,
                                                       procParams, methodFlags,
-                                                      &revStatus, pReasonCode,
+                                                      &revStatus,
+                                                      (CERTCRLEntryReasonCode *)pReasonCode,
                                                       &nbioContext, plContext),
                         PKIX_REVCHECKERCHECKFAILED);
                     methodStatus[methodNum] = revStatus;
diff --git a/lib/libpkix/pkix/checker/pkix_revocationchecker.h b/lib/libpkix/pkix/checker/pkix_revocationchecker.h
index 80d9eeaa2..20dfe3778 100755
--- a/lib/libpkix/pkix/checker/pkix_revocationchecker.h
+++ b/lib/libpkix/pkix/checker/pkix_revocationchecker.h
@@ -12,6 +12,7 @@
 #define _PKIX_REVOCATIONCHECKER_H
 
 #include "pkixt.h"
+#include "certt.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libpkix/pkix/checker/pkix_revocationmethod.h b/lib/libpkix/pkix/checker/pkix_revocationmethod.h
index 193223731..a97c7620a 100644
--- a/lib/libpkix/pkix/checker/pkix_revocationmethod.h
+++ b/lib/libpkix/pkix/checker/pkix_revocationmethod.h
@@ -31,7 +31,7 @@ pkix_LocalRevocationCheckFn(PKIX_PL_Cert *cert, PKIX_PL_Cert *issuer,
                             PKIX_UInt32 methodFlags,
                             PKIX_Boolean chainVerificationState,
                             PKIX_RevocationStatus *pRevStatus,
-                            PKIX_UInt32 *reasonCode,
+                            CERTCRLEntryReasonCode *reasonCode,
                             void *plContext);
 
 /* External revocation check function prototype definition.
@@ -44,7 +44,7 @@ pkix_ExternalRevocationCheckFn(PKIX_PL_Cert *cert, PKIX_PL_Cert *issuer,
                                PKIX_ProcessingParams *procParams,
                                PKIX_UInt32 methodFlags,
                                PKIX_RevocationStatus *pRevStatus,
-                               PKIX_UInt32 *reasonCode,
+                               CERTCRLEntryReasonCode *reasonCode,
                                void **pNBIOContext, void *plContext);
 
 /* Revocation method structure assosiates revocation types with
diff --git a/lib/libpkix/pkix/crlsel/pkix_crlselector.c b/lib/libpkix/pkix/crlsel/pkix_crlselector.c
index 9967af9b8..e9a9c03df 100755
--- a/lib/libpkix/pkix/crlsel/pkix_crlselector.c
+++ b/lib/libpkix/pkix/crlsel/pkix_crlselector.c
@@ -190,7 +190,7 @@ pkix_CRLSelector_Hashcode(
         PKIX_HASHCODE(crlSelector->context, &contextHash, plContext,
                 PKIX_OBJECTHASHCODEFAILED);
 
-        hash = 31 * ((PKIX_UInt32)crlSelector->matchCallback +
+        hash = 31 * ((PKIX_UInt32)((char *)crlSelector->matchCallback - (char *)NULL) +
                     (contextHash << 3)) + paramsHash;
 
         *pHashcode = hash;
diff --git a/lib/libpkix/pkix/results/pkix_policynode.c b/lib/libpkix/pkix/results/pkix_policynode.c
index 91d8a74b6..fd8cee982 100755
--- a/lib/libpkix/pkix/results/pkix_policynode.c
+++ b/lib/libpkix/pkix/results/pkix_policynode.c
@@ -824,7 +824,7 @@ pkix_PolicyNode_Hashcode(
                 (node, &nodeHash, plContext),
                 PKIX_SINGLEPOLICYNODEHASHCODEFAILED);
 
-        nodeHash = 31*nodeHash + (PKIX_UInt32)(node->parent);
+        nodeHash = 31*nodeHash + (PKIX_UInt32)((char *)node->parent - (char *)NULL);
 
         PKIX_HASHCODE
                 (node->children,
diff --git a/lib/libpkix/pkix/store/pkix_store.c b/lib/libpkix/pkix/store/pkix_store.c
index 31c21ea16..af8be2bb2 100755
--- a/lib/libpkix/pkix/store/pkix_store.c
+++ b/lib/libpkix/pkix/store/pkix_store.c
@@ -74,11 +74,11 @@ pkix_CertStore_Hashcode(
                    PKIX_CERTSTOREHASHCODEFAILED);
         }
 
-        *pHashcode = (PKIX_UInt32) certStore->certCallback +
-                     (PKIX_UInt32) certStore->crlCallback +
-                     (PKIX_UInt32) certStore->certContinue +
-                     (PKIX_UInt32) certStore->crlContinue +
-                     (PKIX_UInt32) certStore->trustCallback +
+        *pHashcode = (PKIX_UInt32)((char *)certStore->certCallback - (char *)NULL) +
+                     (PKIX_UInt32)((char *)certStore->crlCallback - (char *)NULL) +
+                     (PKIX_UInt32)((char *)certStore->certContinue - (char *)NULL) +
+                     (PKIX_UInt32)((char *)certStore->crlContinue - (char *)NULL) +
+                     (PKIX_UInt32)((char *)certStore->trustCallback - (char *)NULL) +
                      (tempHash << 7);
 
 cleanup:
diff --git a/lib/libpkix/pkix/top/pkix_build.c b/lib/libpkix/pkix/top/pkix_build.c
index 9ca307e43..94515785b 100755
--- a/lib/libpkix/pkix/top/pkix_build.c
+++ b/lib/libpkix/pkix/top/pkix_build.c
@@ -1526,7 +1526,7 @@ pkix_Build_SelectCertsFromTrustAnchors(
     PKIX_List **pMatchList,
     void *plContext) 
 {
-    int anchorIndex = 0;
+    unsigned int anchorIndex = 0;
     PKIX_TrustAnchor *anchor = NULL;
     PKIX_PL_Cert *trustedCert = NULL;
     PKIX_List *matchList = NULL;
diff --git a/lib/libpkix/pkix/util/pkix_error.c b/lib/libpkix/pkix/util/pkix_error.c
index e6fba866a..9d730ca16 100755
--- a/lib/libpkix/pkix/util/pkix_error.c
+++ b/lib/libpkix/pkix/util/pkix_error.c
@@ -325,7 +325,7 @@ pkix_Error_Hashcode(
 
         /* XXX Unimplemented */
         /* XXX Need to make hashcodes equal when two errors are equal */
-        *pResult = (PKIX_UInt32)object;
+        *pResult = (PKIX_UInt32)((char *)object - (char *)NULL);
 
         PKIX_RETURN(ERROR);
 }
diff --git a/lib/libpkix/pkix/util/pkix_logger.c b/lib/libpkix/pkix/util/pkix_logger.c
index cfd870def..a916e6e4f 100644
--- a/lib/libpkix/pkix/util/pkix_logger.c
+++ b/lib/libpkix/pkix/util/pkix_logger.c
@@ -492,7 +492,7 @@ pkix_Logger_Hashcode(
         PKIX_HASHCODE(logger->context, &tempHash, plContext,
                 PKIX_OBJECTHASHCODEFAILED);
 
-        hash = (((((PKIX_UInt32) logger->callback + tempHash) << 7) +
+        hash = (((((PKIX_UInt32)((char *)logger->callback - (char *)NULL) + tempHash) << 7) +
                 logger->maxLevel) << 7) + (PKIX_UInt32)logger->logComponent;
 
         *pHashcode = hash;
diff --git a/lib/libpkix/pkix/util/pkix_tools.h b/lib/libpkix/pkix/util/pkix_tools.h
index fe6ce6346..1a4689da7 100755
--- a/lib/libpkix/pkix/util/pkix_tools.h
+++ b/lib/libpkix/pkix/util/pkix_tools.h
@@ -1437,8 +1437,8 @@ extern PLHashNumber PR_CALLBACK pkix_ErrorGen_Hash (const void *key);
 typedef struct pkix_ClassTable_EntryStruct pkix_ClassTable_Entry;
 struct pkix_ClassTable_EntryStruct {
         char *description;
-        PKIX_Int32 objCounter;
-        PKIX_Int32 typeObjectSize;
+        PKIX_UInt32 objCounter;
+        PKIX_UInt32 typeObjectSize;
         PKIX_PL_DestructorCallback destructor;
         PKIX_PL_EqualsCallback equalsFunction;
         PKIX_PL_HashcodeCallback hashcodeFunction;
diff --git a/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpdefaultclient.c b/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpdefaultclient.c
index d459a4a7b..9954f0ca6 100644
--- a/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpdefaultclient.c
+++ b/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpdefaultclient.c
@@ -265,7 +265,7 @@ pkix_pl_HttpDefaultClient_HdrCheckComplete(
              contentLength =                 /* Try to reserve 4K+ buffer */
                  client->filledupBytes + HTTP_DATA_BUFSIZE;
              if (client->maxResponseLen > 0 &&
-                 contentLength > client->maxResponseLen) {
+                 contentLength > (PKIX_Int32)client->maxResponseLen) {
                  if (client->filledupBytes < client->maxResponseLen) {
                      contentLength = client->maxResponseLen;
                  } else {
@@ -282,7 +282,7 @@ pkix_pl_HttpDefaultClient_HdrCheckComplete(
          default:
              client->rcv_http_data_len = contentLength;
              if (client->maxResponseLen > 0 &&
-                 client->maxResponseLen < contentLength) {
+                 (PKIX_Int32)client->maxResponseLen < contentLength) {
                  client->connectStatus = HTTP_ERROR;
                  goto cleanup;
              }
@@ -290,7 +290,7 @@ pkix_pl_HttpDefaultClient_HdrCheckComplete(
              /*
               * Do we have all of the message body, or do we need to read some more?
               */
-             if (client->filledupBytes < contentLength) {
+             if ((PKIX_Int32)client->filledupBytes < contentLength) {
                  client->connectStatus = HTTP_RECV_BODY;
                  *pKeepGoing = PKIX_TRUE;
              } else {
@@ -935,7 +935,7 @@ pkix_pl_HttpDefaultClient_RecvBody(
                  * plus remaining capacity, plus new expansion. */
                 int currBuffSize = client->capacity;
                 /* Try to increase the buffer by 4K */
-                int newLength = currBuffSize + HTTP_DATA_BUFSIZE;
+                unsigned int newLength = currBuffSize + HTTP_DATA_BUFSIZE;
                 if (client->maxResponseLen > 0 &&
                     newLength > client->maxResponseLen) {
                         newLength = client->maxResponseLen;
@@ -1480,8 +1480,6 @@ pkix_pl_HttpDefaultClient_Cancel(
         SEC_HTTP_REQUEST_SESSION request,
         void *plContext)
 {
-        PKIX_PL_HttpDefaultClient *client = NULL;
-
         PKIX_ENTER(HTTPDEFAULTCLIENT, "pkix_pl_HttpDefaultClient_Cancel");
         PKIX_NULLCHECK_ONE(request);
 
@@ -1491,8 +1489,6 @@ pkix_pl_HttpDefaultClient_Cancel(
                 plContext),
                 PKIX_REQUESTNOTANHTTPDEFAULTCLIENT);
 
-        client = (PKIX_PL_HttpDefaultClient *)request;
-
         /* XXX Not implemented */
 
 cleanup:
diff --git a/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldaprequest.c b/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldaprequest.c
index 51ffce97c..4546e339a 100644
--- a/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldaprequest.c
+++ b/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldaprequest.c
@@ -263,16 +263,12 @@ pkix_pl_LdapRequest_Destroy(
         PKIX_PL_Object *object,
         void *plContext)
 {
-        PKIX_PL_LdapRequest *ldapRq = NULL;
-
         PKIX_ENTER(LDAPREQUEST, "pkix_pl_LdapRequest_Destroy");
         PKIX_NULLCHECK_ONE(object);
 
         PKIX_CHECK(pkix_CheckType(object, PKIX_LDAPREQUEST_TYPE, plContext),
                     PKIX_OBJECTNOTLDAPREQUEST);
 
-        ldapRq = (PKIX_PL_LdapRequest *)object;
-
         /*
          * All dynamic fields in an LDAPRequest are allocated
          * in an arena, and will be freed when the arena is destroyed.
diff --git a/lib/libpkix/pkix_pl_nss/module/pkix_pl_pk11certstore.c b/lib/libpkix/pkix_pl_nss/module/pkix_pl_pk11certstore.c
index 078862c8b..7de614ea6 100755
--- a/lib/libpkix/pkix_pl_nss/module/pkix_pl_pk11certstore.c
+++ b/lib/libpkix/pkix_pl_nss/module/pkix_pl_pk11certstore.c
@@ -379,14 +379,12 @@ NameCacheHasFetchedCrlInfo(PKIX_PL_Cert *pkixCert,
     PKIX_Boolean hasFetchedCrlInCache = PKIX_TRUE;
     PKIX_List *dpList = NULL;
     pkix_pl_CrlDp *dp = NULL;
-    CERTCertificate *cert;
     PKIX_UInt32 dpIndex = 0;
     SECStatus rv = SECSuccess;
     PRTime reloadDelay = 0, badCrlInvalDelay = 0;
 
     PKIX_ENTER(CERTSTORE, "ChechCacheHasFetchedCrl");
 
-    cert = pkixCert->nssCert;
     reloadDelay = 
         ((PKIX_PL_NssContext*)plContext)->crlReloadDelay *
                                                 PR_USEC_PER_SEC;
@@ -480,7 +478,7 @@ pkix_pl_Pk11CertStore_CheckRevByCrl(
         PKIX_PL_Cert *pkixIssuer,
         PKIX_PL_Date *date,
         PKIX_Boolean  crlDownloadDone,
-        PKIX_UInt32  *pReasonCode,
+        CERTCRLEntryReasonCode *pReasonCode,
         PKIX_RevocationStatus *pStatus,
         void *plContext)
 {
@@ -675,7 +673,7 @@ RemovePartitionedDpsFromList(PKIX_List *dpList, PKIX_PL_Date *date,
 {
     NamedCRLCache* nameCrlCache = NULL;
     pkix_pl_CrlDp *dp = NULL;
-    int dpIndex = 0;
+    unsigned int dpIndex = 0;
     PRTime time;
     PRTime reloadDelay = 0, badCrlInvalDelay = 0;
     SECStatus rv;
@@ -779,7 +777,6 @@ DownloadCrl(pkix_pl_CrlDp *dp, PKIX_PL_CRL **crl,
     SECItem *derCrlCopy = NULL;
     CERTSignedCrl *nssCrl = NULL;
     CERTGeneralName *genName = NULL;
-    PKIX_Int32 savedError = -1;
     SECItem **derGenNames = NULL;
     SECItem  *derGenName = NULL;
 
@@ -799,13 +796,11 @@ DownloadCrl(pkix_pl_CrlDp *dp, PKIX_PL_CRL **crl,
             if (!derGenName ||
                 !genName->name.other.data) {
                 /* get to next name if no data. */
-                savedError = PKIX_UNSUPPORTEDCRLDPTYPE;
                 break;
             }
             uri = &genName->name.other;
             location = (char*)PR_Malloc(1 + uri->len);
             if (!location) {
-                savedError = PKIX_ALLOCERROR;
                 break;
             }
             PORT_Memcpy(location, uri->data, uri->len);
@@ -813,7 +808,6 @@ DownloadCrl(pkix_pl_CrlDp *dp, PKIX_PL_CRL **crl,
             if (CERT_ParseURL(location, &hostname,
                               &port, &path) != SECSuccess) {
                 PORT_SetError(SEC_ERROR_BAD_CRL_DP_URL);
-                savedError = PKIX_URLPARSINGFAILED;
                 break;
             }
     
@@ -823,7 +817,6 @@ DownloadCrl(pkix_pl_CrlDp *dp, PKIX_PL_CRL **crl,
             if ((*hcv1->createSessionFcn)(hostname, port, 
                                           &pServerSession) != SECSuccess) {
                 PORT_SetError(SEC_ERROR_BAD_CRL_DP_URL);
-                savedError = PKIX_URLPARSINGFAILED;
                 break;
             }
 
@@ -835,7 +828,6 @@ DownloadCrl(pkix_pl_CrlDp *dp, PKIX_PL_CRL **crl,
                           PR_SecondsToInterval(
                               ((PKIX_PL_NssContext*)plContext)->timeoutSeconds),
                                    &pRequestSession) != SECSuccess) {
-                savedError = PKIX_HTTPSERVERERROR;
                 break;
             }
 
@@ -858,12 +850,10 @@ DownloadCrl(pkix_pl_CrlDp *dp, PKIX_PL_CRL **crl,
                     NULL,
                     &myHttpResponseData,
                     &myHttpResponseDataLen) != SECSuccess) {
-                savedError = PKIX_HTTPSERVERERROR;
                 break;
             }
 
             if (myHttpResponseCode != 200) {
-                savedError = PKIX_HTTPSERVERERROR;
                 break;
             }
         } while(0);
diff --git a/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c b/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
index 2afd680c6..6bd0a3a09 100644
--- a/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
+++ b/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
@@ -62,7 +62,12 @@ static PKIX_Boolean socketTraceFlag = PKIX_FALSE;
 static void pkix_pl_socket_timestamp() {
         PRInt64 prTime;
         prTime = PR_Now();
+/* We shouldn't use PR_ALTERNATE_INT64_TYPEDEF, but nor can we use PRId64 */
+#if PR_BYTES_PER_LONG == 8 && !defined(PR_ALTERNATE_INT64_TYPEDEF)
+        printf("%ld:\n", prTime);
+#else
         printf("%lld:\n", prTime);
+#endif
 }
 
 /*
@@ -140,7 +145,7 @@ static void pkix_pl_socket_linePrefix(PKIX_UInt32 addr) {
  */
 static void pkix_pl_socket_traceLine(char *ptr) {
         PKIX_UInt32 i = 0;
-        pkix_pl_socket_linePrefix((PKIX_UInt32)ptr);
+        pkix_pl_socket_linePrefix((PKIX_UInt32)((char *)ptr - (char *)NULL));
         for (i = 0; i < 16; i++) {
                 printf(" ");
                 pkix_pl_socket_hexDigit(ptr[i]);
@@ -184,7 +189,7 @@ static void pkix_pl_socket_traceLine(char *ptr) {
 static void pkix_pl_socket_tracePartialLine(char *ptr, PKIX_UInt32 nBytes) {
         PKIX_UInt32 i = 0;
         if (nBytes > 0) {
-                pkix_pl_socket_linePrefix((PKIX_UInt32)ptr);
+                pkix_pl_socket_linePrefix((PKIX_UInt32)((char *)ptr - (char *)NULL));
         }
         for (i = 0; i < nBytes; i++) {
                 printf(" ");
@@ -243,7 +248,7 @@ void pkix_pl_socket_tracebuff(void *buf, PKIX_UInt32 nBytes) {
          * Special case: if called with length of zero, just do address
          */
         if (nBytes == 0) {
-                pkix_pl_socket_linePrefix((PKIX_UInt32)buf);
+                pkix_pl_socket_linePrefix((PKIX_UInt32)((char *)buf - (char *)NULL));
                 printf("\n");
         } else {
                 while (bytesRemaining >= 16) {
diff --git a/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c b/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c
index 2036f5c9f..fa8f1851e 100644
--- a/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c
+++ b/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c
@@ -1515,7 +1515,6 @@ PKIX_PL_Cert_Create(
         SECItem *derCertItem = NULL;
         void *derBytes = NULL;
         PKIX_UInt32 derLength;
-        PKIX_Boolean copyDER;
         PKIX_PL_Cert *cert = NULL;
         CERTCertDBHandle *handle;
 
@@ -1542,7 +1541,6 @@ PKIX_PL_Cert_Create(
          * allowing us to free our copy without worrying about whether NSS
          * is still using it
          */
-        copyDER = PKIX_TRUE;
         handle  = CERT_GetDefaultCertDB();
         nssCert = CERT_NewTempCertificate(handle, derCertItem,
 					  /* nickname */ NULL, 
diff --git a/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crl.c b/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crl.c
index 0f6d78333..b83db357a 100644
--- a/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crl.c
+++ b/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crl.c
@@ -351,7 +351,7 @@ pkix_pl_CRL_ToString_Helper(
         void *plContext)
 {
         char *asciiFormat = NULL;
-        PKIX_UInt32 crlVersion;
+        PKIX_UInt32 crlVersion = 0;
         PKIX_PL_X500Name *crlIssuer = NULL;
         PKIX_PL_OID *nssSignatureAlgId = NULL;
         PKIX_PL_BigInt *crlNumber = NULL;
diff --git a/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c b/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c
index 6bc74b611..338eb1c01 100755
--- a/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c
+++ b/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c
@@ -73,7 +73,7 @@ pkix_pl_lifecycle_ObjectTableUpdate(int *objCountTable)
 PKIX_UInt32
 pkix_pl_lifecycle_ObjectLeakCheck(int *initObjCountTable)
 {
-        int   typeCounter = 0;
+        unsigned int typeCounter = 0;
         PKIX_UInt32 numObjects = 0;
         char  classNameBuff[128];
         char *className = NULL;
@@ -245,7 +245,9 @@ cleanup:
 PKIX_Error *
 PKIX_PL_Shutdown(void *plContext)
 {
+#ifdef DEBUG
         PKIX_UInt32 numLeakedObjects = 0;
+#endif
 
         PKIX_ENTER(OBJECT, "PKIX_PL_Shutdown");
 
@@ -258,10 +260,14 @@ PKIX_PL_Shutdown(void *plContext)
 
         pkix_pl_HttpCertStore_Shutdown(plContext);
 
+#ifdef DEBUG
         numLeakedObjects = pkix_pl_lifecycle_ObjectLeakCheck(NULL);
         if (PR_GetEnv("NSS_STRICT_SHUTDOWN")) {
            PORT_Assert(numLeakedObjects == 0);
         }
+#else
+        pkix_pl_lifecycle_ObjectLeakCheck(NULL);
+#endif
 
         if (plContext != NULL) {
                 PKIX_PL_NssContext_Destroy(plContext);
diff --git a/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c b/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c
index 881a1ed54..9a33fd5e5 100755
--- a/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c
+++ b/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c
@@ -371,7 +371,7 @@ pkix_pl_Object_Hashcode_Default(
         PKIX_ENTER(OBJECT, "pkix_pl_Object_Hashcode_Default");
         PKIX_NULLCHECK_TWO(object, pValue);
 
-        *pValue = (PKIX_UInt32)object;
+        *pValue = (PKIX_UInt32)((char *)object - (char *)NULL);
 
         PKIX_RETURN(OBJECT);
 }