diff --git a/security/nss/lib/freebl/ecl/ecp_256.c b/security/nss/lib/freebl/ecl/ecp_256.c
index 67d2b411641..15d29ab6e66 100644
--- a/security/nss/lib/freebl/ecl/ecp_256.c
+++ b/security/nss/lib/freebl/ecl/ecp_256.c
@@ -371,7 +371,7 @@ ec_GFp_nistp256_mod(const mp_int *a, mp_int *r, const GFMethod *meth)
 
 		/* final reduction if necessary */
 		if ((r3 > 0xFFFFFFFF00000001ULL) ||
-			((r3 == 0xFFFFFFFF00000001UL) && 
+			((r3 == 0xFFFFFFFF00000001ULL) && 
 			(r2 || (r1 >> 32)|| 
 			       (r1 == 0xFFFFFFFFULL && r0 == MP_DIGIT_MAX)))) {
 			/* very rare, just use mp_sub */
diff --git a/security/nss/lib/freebl/mpi/mp_gf2m.c b/security/nss/lib/freebl/mpi/mp_gf2m.c
index 962fdb1fb91..5ce9fed9e30 100644
--- a/security/nss/lib/freebl/mpi/mp_gf2m.c
+++ b/security/nss/lib/freebl/mpi/mp_gf2m.c
@@ -92,7 +92,7 @@ s_bmul_1x1(mp_digit *rh, mp_digit *rl, const mp_digit a, const mp_digit b)
     mp_digit tab[16], top3b = a >> 61;
     register mp_digit a1, a2, a4, a8;
 
-    a1 = a & (0x1FFFFFFFFFFFFFFF); a2 = a1 << 1; 
+    a1 = a & (0x1FFFFFFFFFFFFFFFULL); a2 = a1 << 1; 
     a4 = a2 << 1; a8 = a4 << 1;
     tab[ 0] = 0;     tab[ 1] = a1;       tab[ 2] = a2;       tab[ 3] = a1^a2;
     tab[ 4] = a4;    tab[ 5] = a1^a4;    tab[ 6] = a2^a4;    tab[ 7] = a1^a2^a4;