Fix the big-endian issue with memcpy in S390/x

gong-cr · Nov 7, 2023 · 7568887 · 7568887
1 parent 7a7df9e
commit 7568887
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 0 deletions.
diff --git a/src/pke/lib/scheme/bfvrns/bfvrns-cryptoparameters.cpp b/src/pke/lib/scheme/bfvrns/bfvrns-cryptoparameters.cpp
@@ -72,8 +72,13 @@ void CryptoParametersBFVRNS::PrecomputeCRTTables(KeySwitchTechnique ksTech, Scal
     for (uint32_t i = 0; i < sizeQ; i++) {
         BigInteger mu = BarrettBase128Bit / BigInteger(moduliQ[i]);
         uint64_t val[2];
+#ifdef __s390__
+        val[1] = (mu % TwoPower64).ConvertToInt();
+        val[0] = mu.RShift(64).ConvertToInt();
+#else
         val[0] = (mu % TwoPower64).ConvertToInt();
         val[1] = mu.RShift(64).ConvertToInt();
+#endif
         memcpy(&m_modqBarrettMu[i], val, sizeof(DoubleNativeInt));
     }
 
@@ -143,8 +148,13 @@ void CryptoParametersBFVRNS::PrecomputeCRTTables(KeySwitchTechnique ksTech, Scal
         for (uint32_t i = 0; i < sizeR; i++) {
             BigInteger mu = BarrettBase128Bit / BigInteger(moduliR[i]);
             uint64_t val[2];
+#ifdef __s390__
+            val[1] = (mu % TwoPower64).ConvertToInt();
+            val[0] = mu.RShift(64).ConvertToInt();
+#else
             val[0] = (mu % TwoPower64).ConvertToInt();
             val[1] = mu.RShift(64).ConvertToInt();
+#endif
 
             memcpy(&m_modrBarrettMu[i], val, sizeof(DoubleNativeInt));
         }
@@ -261,8 +271,13 @@ void CryptoParametersBFVRNS::PrecomputeCRTTables(KeySwitchTechnique ksTech, Scal
         for (uint32_t j = 0; j < moduliR.size(); j++) {
             BigInteger mu = BarrettBase128Bit / BigInteger(moduliR[j]);
             uint64_t val[2];
+#ifdef __s390__
+            val[1] = (mu % TwoPower64).ConvertToInt();
+            val[0] = mu.RShift(64).ConvertToInt();
+#else
             val[0] = (mu % TwoPower64).ConvertToInt();
             val[1] = mu.RShift(64).ConvertToInt();
+#endif
 
             memcpy(&m_modrBarrettMu[j], val, sizeof(DoubleNativeInt));
         }
@@ -716,8 +731,13 @@ void CryptoParametersBFVRNS::PrecomputeCRTTables(KeySwitchTechnique ksTech, Scal
         for (uint32_t i = 0; i < m_modbskBarrettMu.size(); i++) {
             BigInteger mu = BarrettBase128Bit / BigInteger(m_moduliBsk[i]);
             uint64_t val[2];
+#ifdef __s390__
+            val[1] = (mu % TwoPower64).ConvertToInt();
+            val[0] = mu.RShift(64).ConvertToInt();
+#else
             val[0] = (mu % TwoPower64).ConvertToInt();
             val[1] = mu.RShift(64).ConvertToInt();
+#endif
             memcpy(&m_modbskBarrettMu[i], val, sizeof(DoubleNativeInt));
         }
 

diff --git a/src/pke/lib/scheme/bgvrns/bgvrns-cryptoparameters.cpp b/src/pke/lib/scheme/bgvrns/bgvrns-cryptoparameters.cpp
@@ -148,8 +148,13 @@ void CryptoParametersBGVRNS::PrecomputeCRTTables(KeySwitchTechnique ksTech, Scal
         for (uint32_t i = 0; i < sizeQ; i++) {
             BigInteger mu = BarrettBase128Bit / BigInteger(moduliQ[i]);
             uint64_t val[2];
+#ifdef __s390__
+            val[1] = (mu % TwoPower64).ConvertToInt();
+            val[0] = mu.RShift(64).ConvertToInt();
+#else
             val[0] = (mu % TwoPower64).ConvertToInt();
             val[1] = mu.RShift(64).ConvertToInt();
+#endif
             memcpy(&m_modqBarrettMu[i], val, sizeof(DoubleNativeInt));
         }
     }

diff --git a/src/pke/lib/scheme/ckksrns/ckksrns-cryptoparameters.cpp b/src/pke/lib/scheme/ckksrns/ckksrns-cryptoparameters.cpp
@@ -154,8 +154,13 @@ void CryptoParametersCKKSRNS::PrecomputeCRTTables(KeySwitchTechnique ksTech, Sca
         for (uint32_t i = 0; i < sizeQ; i++) {
             BigInteger mu = BarrettBase128Bit / BigInteger(moduliQ[i]);
             uint64_t val[2];
+#ifdef __s390__
+            val[1] = (mu % TwoPower64).ConvertToInt();
+            val[0] = mu.RShift(64).ConvertToInt();
+#else
             val[0] = (mu % TwoPower64).ConvertToInt();
             val[1] = mu.RShift(64).ConvertToInt();
+#endif
 
             memcpy(&m_modqBarrettMu[i], val, sizeof(DoubleNativeInt));
         }

diff --git a/src/pke/lib/scheme/ckksrns/ckksrns-multiparty.cpp b/src/pke/lib/scheme/ckksrns/ckksrns-multiparty.cpp
@@ -254,8 +254,13 @@ void PrecomputeRNSExtensionTables(CryptoContext<DCRTPoly>& cc, usint from, usint
     for (uint32_t j = 0; j < moduliP.size(); j++) {
         BigInteger mu = BarrettBase128Bit / BigInteger(moduliP[j]);
         uint64_t val[2];
+#ifdef __s390__
+        val[1] = (mu % TwoPower64).ConvertToInt();
+        val[0] = mu.RShift(64).ConvertToInt();
+#else
         val[0] = (mu % TwoPower64).ConvertToInt();
         val[1] = mu.RShift(64).ConvertToInt();
+#endif
 
         memcpy(&rnsExtTables.modpBarrettMu[j], val, sizeof(DoubleNativeInt));
     }

diff --git a/src/pke/lib/schemerns/rns-cryptoparameters.cpp b/src/pke/lib/schemerns/rns-cryptoparameters.cpp
@@ -276,8 +276,13 @@ void CryptoParametersRNS::PrecomputeCRTTables(KeySwitchTechnique ksTech, Scaling
                 for (uint32_t i = 0; i < moduli.size(); i++) {
                     BigInteger mu = BarrettBase128Bit / BigInteger(moduli[i]);
                     uint64_t val[2];
+#ifdef __s390__
+                    val[1] = (mu % TwoPower64).ConvertToInt();
+                    val[0] = mu.RShift(64).ConvertToInt();
+#else
                     val[0] = (mu % TwoPower64).ConvertToInt();
                     val[1] = mu.RShift(64).ConvertToInt();
+#endif
 
                     memcpy(&m_modComplPartqBarrettMu[l][j][i], val, sizeof(DoubleNativeInt));
                 }
@@ -385,8 +390,13 @@ void CryptoParametersRNS::PrecomputeCRTTables(KeySwitchTechnique ksTech, Scaling
         m_multipartyModq0BarrettMu.resize(1);
         BigInteger mu = BarrettBase128Bit / BigInteger(moduliQ[0]);
         uint64_t val[2];
+#ifdef __s390__
+        val[1] = (mu % TwoPower64).ConvertToInt();
+        val[0] = mu.RShift(64).ConvertToInt();
+#else
         val[0] = (mu % TwoPower64).ConvertToInt();
         val[1] = mu.RShift(64).ConvertToInt();
+#endif
         memcpy(&m_multipartyModq0BarrettMu[0], val, sizeof(DoubleNativeInt));
 
         // Stores \frac{1/q_i}