develop: make it build

firedancer-io · Oct 17, 2023 · 1dcaed0 · 1dcaed0
1 parent 674e437
commit 1dcaed0
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 49 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -90,7 +90,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   # Common compilation flags and warning configuration
   set(
     CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wfatal-errors"
+    "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -Wfatal-errors"
   )
   if("${MULTICORE}")
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
@@ -233,4 +233,4 @@ if ("${IS_LIBFF_PARENT}")
   # Add a 'make clang-tidy' target that runs clang-tidy using checks specified in .clang-tidy
   include(clang-tidy.cmake)
 endif()
-add_subdirectory(libff)
+add_subdirectory(libff)
diff --git a/depends/ate-pairing b/depends/ate-pairing
diff --git a/depends/gtest b/depends/gtest
diff --git a/depends/xbyak b/depends/xbyak
diff --git a/libff/CMakeLists.txt b/libff/CMakeLists.txt
@@ -80,35 +80,6 @@ target_include_directories(
   PUBLIC ..
 )
 
-# Sodium for binary fields.
- find_path(
-   SODIUM_INCLUDE_DIR
-   sodium.h
-   HINTS ${LIBSODIUM_INCLUDE_DIRS}
-   /usr/local/include /opt/local/include /opt/include
- )
- find_library(
-   SODIUM_LIBRARY
-   NAMES sodium
-   HINTS ${LIBSODIUM_LIBRARY_DIRS}
-   /usr/local/lib /opt/local/lib /opt/lib
- )
-
- target_include_directories(
-   ff
-   PUBLIC
-   ${SODIUM_INCLUDE_DIR}
- )
- target_compile_options(
-   ff
-   PUBLIC
-   ${LIBSODIUM_CFLAGS} ${LIBSODIUM_CFLAGS_OTHER}
- )
- target_link_libraries(
-   ff
-   ${SODIUM_LIBRARY} ${LIBSODIUM_LDFLAGS_OTHER}
- )
-
 install(
   DIRECTORY "" DESTINATION "include/libff"
   FILES_MATCHING

diff --git a/libff/algebra/fields/binary/gf128.cpp b/libff/algebra/fields/binary/gf128.cpp
@@ -2,8 +2,7 @@
 
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-
-#include <sodium/randombytes.h>
+#include <sys/random.h>
 
 #include "libff/algebra/field_utils/algorithms.hpp"
 #include "libff/algebra/fields/binary/gf128.hpp"
@@ -243,7 +242,7 @@ gf128 gf128::sqrt() const
 
 void gf128::randomize()
 {
-    randombytes_buf(&this->value_, 128/8);
+  getrandom(&this->value_, 128/8, 0);
 }
 
 void gf128::clear()

diff --git a/libff/algebra/fields/binary/gf192.cpp b/libff/algebra/fields/binary/gf192.cpp
@@ -2,8 +2,7 @@
 
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-
-#include <sodium/randombytes.h>
+#include <sys/random.h>
 
 #include "libff/algebra/field_utils/algorithms.hpp"
 #include "libff/algebra/fields/binary/gf192.hpp"
@@ -294,7 +293,7 @@ gf192 gf192::sqrt() const
 
 void gf192::randomize()
 {
-    randombytes_buf(&this->value_, 192/8);
+  getrandom(&this->value_, 192/8, 0);
 }
 
 void gf192::clear()

diff --git a/libff/algebra/fields/binary/gf256.cpp b/libff/algebra/fields/binary/gf256.cpp
@@ -2,8 +2,7 @@
 
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-
-#include <sodium/randombytes.h>
+#include <sys/random.h>
 
 #include "libff/algebra/field_utils/algorithms.hpp"
 #include "libff/algebra/fields/binary/gf256.hpp"
@@ -366,7 +365,7 @@ gf256 gf256::sqrt() const
 
 void gf256::randomize()
 {
-    randombytes_buf(&this->value_, 256/8);
+  getrandom(&this->value_, 256/8, 0);
 }
 
 void gf256::clear()

diff --git a/libff/algebra/fields/binary/gf32.cpp b/libff/algebra/fields/binary/gf32.cpp
@@ -2,8 +2,7 @@
 
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-
-#include <sodium/randombytes.h>
+#include <sys/random.h>
 
 #include "libff/algebra/field_utils/algorithms.hpp"
 #include "libff/algebra/fields/binary/gf32.hpp"
@@ -204,7 +203,7 @@ gf32 gf32::sqrt() const
 
 void gf32::randomize()
 {
-    randombytes_buf(&this->value_, 32/8);
+  getrandom(&this->value_, 32/8, 0);
 }
 
 void gf32::clear()

diff --git a/libff/algebra/fields/binary/gf64.cpp b/libff/algebra/fields/binary/gf64.cpp
@@ -2,8 +2,7 @@
 
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-
-#include <sodium/randombytes.h>
+#include <sys/random.h>
 
 #include "libff/algebra/field_utils/algorithms.hpp"
 #include "libff/algebra/fields/binary/gf64.hpp"
@@ -245,7 +244,7 @@ gf64 gf64::sqrt() const
 
 void gf64::randomize()
 {
-    randombytes_buf(&this->value_, 64/8);
+  getrandom(&this->value_, 64/8, 0);
 }
 
 void gf64::clear()
+1 −1		common.mk
+5 −5		include/bn.h
+2 −2		include/zm.h
+33 −31		readme.md
+2,715 −0		src/xbyak/xbyak.h
+2,038 −0		src/xbyak/xbyak_mnemonic.h
+879 −0		src/xbyak/xbyak_util.h
+4 −4		src/zm2.cpp
+2 −2		test/bench.cpp