diff --git a/cryptoTools/CMakeLists.txt b/cryptoTools/CMakeLists.txt index 02ff780..d81bec0 100644 --- a/cryptoTools/CMakeLists.txt +++ b/cryptoTools/CMakeLists.txt @@ -60,7 +60,7 @@ if(NOT MIRACL_LIB) message(FATAL_ERROR "Failed to find miracl at " ${Miracl_Lib_Dirs}) endif() - +set(Boost_NO_SYSTEM_PATHS ON) set(Boost_USE_STATIC_LIBS ON) # only find static libs set(Boost_USE_MULTITHREADED ON) set(Boost_USE_STATIC_RUNTIME ON) @@ -69,9 +69,13 @@ find_package(Boost COMPONENTS system thread) if(Boost_FOUND) include_directories(${Boost_INCLUDE_DIR}) - #message( "Found Boost at ${Boost_LIBRARIES}") + message( "Found Boost library at ${Boost_LIBRARIES}") + message( "Found Boost library at ${Boost_LIBRARY_DIRS}") + message( "Found Boost include at ${Boost_INCLUDE_DIRS}") + message( "Found Boost system library at ${Boost_SYSTEM_LIBRARY}") + message( "Found Boost thread library at ${Boost_THREAD_LIBRARY}") else() - message(FATAL_ERROR "Failed to find boost at " ${Boost_Lib_Dirs} " Need system thread") + message(FATAL_ERROR "Failed to find boost at " ${Boost_Lib_Dirs} " Need system thread") endif() diff --git a/cryptoTools/Crypto/PRNG.h b/cryptoTools/Crypto/PRNG.h index d43c884..e56f20d 100644 --- a/cryptoTools/Crypto/PRNG.h +++ b/cryptoTools/Crypto/PRNG.h @@ -73,8 +73,8 @@ namespace osuCrypto typedef u32 result_type; - static result_type min() { return 0; } - static result_type max() { return (result_type)-1; } + static constexpr result_type min() { return 0; } + static constexpr result_type max() { return (result_type)-1; } result_type operator()() { return get(); } diff --git a/frontend/CLP.h b/frontend/CLP.h index 5d6260b..8deb1d8 100644 --- a/frontend/CLP.h +++ b/frontend/CLP.h @@ -4,6 +4,7 @@ #include #include #include +#include class CommandLineParserError : public std::exception { diff --git a/frontend/CMakeLists.txt b/frontend/CMakeLists.txt index 135638d..7299db4 100644 --- a/frontend/CMakeLists.txt +++ b/frontend/CMakeLists.txt @@ -20,4 +20,8 @@ add_executable(frontend.exe ${SRC_FRONTEND}) #target_link_libraries(frontend.exe libPSI_Tests) target_link_libraries(frontend.exe libOPRF) target_link_libraries(frontend.exe libOTe) -target_link_libraries(frontend.exe libPaXoS) \ No newline at end of file +target_link_libraries(frontend.exe libPaXoS) +set(Boost_NO_SYSTEM_PATHS ON) +find_package(Boost COMPONENTS system thread) +message("frontend is using boost at: ${Boost_LIBRARIES}") +include_directories(${Boost_INCLUDE_DIR}) \ No newline at end of file diff --git a/thirdparty/linux/miracl/miracl_osmt/source/big.o b/thirdparty/linux/miracl/miracl_osmt/source/big.o deleted file mode 100644 index 247dc14..0000000 Binary files a/thirdparty/linux/miracl/miracl_osmt/source/big.o and /dev/null differ diff --git a/thirdparty/linux/miracl/miracl_osmt/source/crt.o b/thirdparty/linux/miracl/miracl_osmt/source/crt.o deleted file mode 100644 index 5c0792c..0000000 Binary files a/thirdparty/linux/miracl/miracl_osmt/source/crt.o and /dev/null differ diff --git a/thirdparty/linux/miracl/miracl_osmt/source/ec2.o b/thirdparty/linux/miracl/miracl_osmt/source/ec2.o deleted file mode 100644 index 26978a3..0000000 Binary files a/thirdparty/linux/miracl/miracl_osmt/source/ec2.o and /dev/null differ diff --git a/thirdparty/linux/miracl/miracl_osmt/source/ecn.o b/thirdparty/linux/miracl/miracl_osmt/source/ecn.o deleted file mode 100644 index 109f8fc..0000000 Binary files a/thirdparty/linux/miracl/miracl_osmt/source/ecn.o and /dev/null differ diff --git a/thirdparty/linux/miracl/miracl_osmt/source/flash.o b/thirdparty/linux/miracl/miracl_osmt/source/flash.o deleted file mode 100644 index 93b15da..0000000 Binary files a/thirdparty/linux/miracl/miracl_osmt/source/flash.o and /dev/null differ diff --git a/thirdparty/linux/miracl/miracl_osmt/source/zzn.o b/thirdparty/linux/miracl/miracl_osmt/source/zzn.o deleted file mode 100644 index 096ff82..0000000 Binary files a/thirdparty/linux/miracl/miracl_osmt/source/zzn.o and /dev/null differ