diff --git a/mozilla/security/nss/lib/pkcs7/certread.c b/mozilla/security/nss/lib/pkcs7/certread.c
index 672e3b132bd..af5504f9445 100644
--- a/mozilla/security/nss/lib/pkcs7/certread.c
+++ b/mozilla/security/nss/lib/pkcs7/certread.c
@@ -179,7 +179,7 @@ CERTPackageType
 CERT_CertPackageType(SECItem *package, SECItem *certitem)
 {
     unsigned char *cp;
-    int seqLen, seqLenLen;
+    unsigned int seqLen, seqLenLen;
     SECItem oiditem;
     SECOidData *oiddata;
     CERTPackageType type = certPackageNone;
diff --git a/mozilla/security/nss/lib/pkcs7/p7local.c b/mozilla/security/nss/lib/pkcs7/p7local.c
index bd74f9bb1fb..c9ce32eab8b 100644
--- a/mozilla/security/nss/lib/pkcs7/p7local.c
+++ b/mozilla/security/nss/lib/pkcs7/p7local.c
@@ -37,7 +37,7 @@
  * encoding/creation side *and* the decoding/decryption side.  Anything
  * else should be static routines in the appropriate file.
  *
- * $Id: p7local.c,v 1.4 2001-12-07 01:36:06 relyea%netscape.com Exp $
+ * $Id: p7local.c,v 1.5 2002-09-07 01:48:46 jpierre%netscape.com Exp $
  */
 
 #include "p7local.h"
@@ -1005,7 +1005,8 @@ SECStatus
 sec_PKCS7ReorderAttributes (SEC_PKCS7Attribute **attrs)
 {
     PRArenaPool *poolp;
-    int num_attrs, i, j, pass, besti;
+    int num_attrs, i, pass, besti;
+    unsigned int j;
     SECItem **enc_attrs;
     SEC_PKCS7Attribute **new_attrs;
 
diff --git a/mozilla/security/nss/lib/ssl/ssl3con.c b/mozilla/security/nss/lib/ssl/ssl3con.c
index 22030dbb37f..103739d5c5a 100644
--- a/mozilla/security/nss/lib/ssl/ssl3con.c
+++ b/mozilla/security/nss/lib/ssl/ssl3con.c
@@ -33,7 +33,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: ssl3con.c,v 1.40 2002-08-09 21:53:15 nelsonb%netscape.com Exp $
+ * $Id: ssl3con.c,v 1.41 2002-09-07 01:44:11 jpierre%netscape.com Exp $
  */
 
 #include "nssrenam.h"
@@ -789,7 +789,7 @@ ssl3_ComputeExportRSAKeyHash(SECItem modulus, SECItem publicExponent,
     	pBuf += 2;
     memcpy(pBuf, publicExponent.data, publicExponent.len);
     	pBuf += publicExponent.len;
-    PORT_Assert(pBuf - hashBuf == bufLen);
+    PORT_Assert((unsigned int)(pBuf - hashBuf) == bufLen);
 
     rv  = PK11_DigestBegin(md5);
     rv |= PK11_DigestOp(md5, hashBuf, bufLen);
@@ -880,7 +880,7 @@ ssl3_ComputeDHKeyHash(SECItem dh_p, SECItem dh_g, SECItem dh_Ys,
     	pBuf += 2;
     memcpy(pBuf, dh_Ys.data, dh_Ys.len);
     	pBuf += dh_Ys.len;
-    PORT_Assert(pBuf - hashBuf == bufLen);
+    PORT_Assert((unsigned int)(pBuf - hashBuf) == bufLen);
 
     rv  = PK11_DigestBegin(md5);
     rv |= PK11_DigestOp(md5, hashBuf, bufLen);
diff --git a/mozilla/security/nss/lib/ssl/sslmutex.c b/mozilla/security/nss/lib/ssl/sslmutex.c
index f11c651318d..a27cb9b1cf9 100644
--- a/mozilla/security/nss/lib/ssl/sslmutex.c
+++ b/mozilla/security/nss/lib/ssl/sslmutex.c
@@ -30,7 +30,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: sslmutex.c,v 1.14 2002-05-18 03:24:17 wtc%netscape.com Exp $
+ * $Id: sslmutex.c,v 1.15 2002-09-07 01:44:11 jpierre%netscape.com Exp $
  */
 
 #include "seccomon.h"
@@ -370,7 +370,6 @@ static SECStatus sslMutex_2LevelDestroy(sslMutex *sem)
 SECStatus
 sslMutex_Init(sslMutex *pMutex, int shared)
 {
-    SECStatus retvalue;
     HANDLE hMutex;
     SECURITY_ATTRIBUTES attributes =
                                 { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE };