From 8b3d0ef4e3a141e8ebd8d3d08d102a224f15dde7 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Tue, 21 Aug 2018 18:05:14 +0100
Subject: [PATCH] libsnark: Use mp_limb_t cast instead of uint64_t when masking
 bigint.data

---
 src/snark/libsnark/algebra/fields/fp.tcc               | 2 +-
 src/snark/libsnark/algebra/fields/fp12_2over3over2.tcc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/snark/libsnark/algebra/fields/fp.tcc b/src/snark/libsnark/algebra/fields/fp.tcc
index 7f17650ad..7556e0140 100644
--- a/src/snark/libsnark/algebra/fields/fp.tcc
+++ b/src/snark/libsnark/algebra/fields/fp.tcc
@@ -690,7 +690,7 @@ Fp_model<n, modulus> Fp_model<n,modulus>::random_element() /// returns random el
             const std::size_t part = bitno/GMP_NUMB_BITS;
             const std::size_t bit = bitno - (GMP_NUMB_BITS*part);
 
-            r.mont_repr.data[part] &= ~(UINT64_C(1)<<bit);
+            r.mont_repr.data[part] &= ~(((mp_limb_t) 1)<<bit);
 
             bitno--;
         }
diff --git a/src/snark/libsnark/algebra/fields/fp12_2over3over2.tcc b/src/snark/libsnark/algebra/fields/fp12_2over3over2.tcc
index 3aedc8415..b8c5b8971 100644
--- a/src/snark/libsnark/algebra/fields/fp12_2over3over2.tcc
+++ b/src/snark/libsnark/algebra/fields/fp12_2over3over2.tcc
@@ -348,7 +348,7 @@ Fp12_2over3over2_model<n, modulus> Fp12_2over3over2_model<n,modulus>::cyclotomic
                 res = res.cyclotomic_squared();
             }
 
-            if (exponent.data[i] & (UINT64_C(1)<<j))
+            if (exponent.data[i] & (((mp_limb_t) 1)<<j))
             {
                 found_one = true;
                 res = res * (*this);