cryptoTools bump

Author: ladnir

CMakePresets.json

@@ -9,10 +9,11 @@
       "binaryDir": "${sourceDir}/out/build/${presetName}",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
+        "FETCH_AUTO": true,
         "ENABLE_ALL_OT": true,
         "ENABLE_SSE": false,
-        "ENABLE_AVX": false,
         "ENABLE_BITPOLYMUL": false,
+        "ENABLE_CIRCUITS": true,
         "LIBOTE_STD_VER": "17",
         "CMAKE_PREFIX_PATH": "${sourceDir}/../out/install",
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
@@ -71,16 +72,16 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "LIBOTE_STD_VER": "17",
-        "ENABLE_ALL_OT": true,
-        "ENABLE_RELIC": true,
-        "ENABLE_SODIUM": true,
-        "ENABLE_BOOST": true,
+        "ENABLE_ALL_OT": false,
+        "ENABLE_RELIC": false,
+        "ENABLE_SODIUM": false,
+        "ENABLE_BOOST": false,
         "ENABLE_OPENSSL": false,
         "FETCH_AUTO": true,
         "ENABLE_CIRCUITS": true,
-        "ENABLE_BITPOLYMUL": true,
+        "ENABLE_BITPOLYMUL": false,
         "VERBOSE_FETCH": true,
-        "ENABLE_PIC": true,
+        "ENABLE_PIC": false,
         "ENABLE_ASAN": false,
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
       },

cryptoTools

@@ -18,6 +18,7 @@ namespace osuCrypto
     inline void QCCodeBench(CLP& cmd)
     {
 
+#ifdef ENABLE_BITPOLYMUL
         u64 trials = cmd.getOr("t", 10);
 
         // the message length of the code. 
@@ -34,7 +35,6 @@ namespace osuCrypto
         // verbose flag.
 
 
-#ifdef ENABLE_BITPOLYMUL
         oc::Timer timer;
         QuasiCyclicCode code;
         auto p = nextPrime(n);
@@ -231,8 +231,8 @@ namespace osuCrypto
 
     inline void transpose(const CLP& cmd)
     {
-        u64 trials = cmd.getOr("trials", 1ull << 18);
 #ifdef ENABLE_AVX
+        u64 trials = cmd.getOr("trials", 1ull << 18);
         {
 
 

frontend/benchmark.h

@@ -456,14 +456,7 @@ namespace osuCrypto
         // create a local to store the partial codeword
         // and zero it out.
         block c[8];
-        c[0] = c[0] ^ c[0];
-        c[1] = c[1] ^ c[1];
-        c[2] = c[2] ^ c[2];
-        c[3] = c[3] ^ c[3];
-        c[4] = c[4] ^ c[4];
-        c[5] = c[5] ^ c[5];
-        c[6] = c[6] ^ c[6];
-        c[7] = c[7] ^ c[7];
+        memset(c, 0, sizeof(block) * 8);
 
         // for performance reasons, we have multiplt implementations, one for
         // each size under 9 blocks wide. There is a general case at the end.
@@ -729,14 +722,15 @@ namespace osuCrypto
         // create a local to store the partial codeword
         // and zero it out.
         block c[8];
-        c[0] = c[0] ^ c[0];
-        c[1] = c[1] ^ c[1];
-        c[2] = c[2] ^ c[2];
-        c[3] = c[3] ^ c[3];
-        c[4] = c[4] ^ c[4];
-        c[5] = c[5] ^ c[5];
-        c[6] = c[6] ^ c[6];
-        c[7] = c[7] ^ c[7];
+        memset(c, 0, sizeof(block) * 8);
+        //c[0] = c[0] ^ c[0];
+        //c[1] = c[1] ^ c[1];
+        //c[2] = c[2] ^ c[2];
+        //c[3] = c[3] ^ c[3];
+        //c[4] = c[4] ^ c[4];
+        //c[5] = c[5] ^ c[5];
+        //c[6] = c[6] ^ c[6];
+        //c[7] = c[7] ^ c[7];
 
         block* g0 = mG8.data() + 0 * rowSize + input[0] * codeSize;
         block* g1 = mG8.data() + 1 * rowSize + input[1] * codeSize;

libOTe/Tools/LinearCode.cpp

@@ -147,7 +147,7 @@ void gfe4x_unpack_single(gfe4x *r, const unsigned char * x, int i)
     r->v[11].v[i] = r->v[11].v[i] + _2_234 - _2_255;
 }
 
-void gfe4x_unpack(gfe4x *r, const unsigned char x[128])
+void gfe4x_unpack(gfe4x *r, const unsigned char* x)
 {
 	gfe4x_unpack_single(r, x, 0);
 	gfe4x_unpack_single(r, x, 1);