Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions cryptoTools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()


Expand Down
4 changes: 2 additions & 2 deletions cryptoTools/Crypto/PRNG.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<result_type>();
}
Expand Down
1 change: 1 addition & 0 deletions frontend/CLP.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <set>
#include <list>
#include <vector>
#include <string>

class CommandLineParserError : public std::exception
{
Expand Down
6 changes: 5 additions & 1 deletion frontend/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
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})
Binary file removed thirdparty/linux/miracl/miracl_osmt/source/big.o
Binary file not shown.
Binary file removed thirdparty/linux/miracl/miracl_osmt/source/crt.o
Binary file not shown.
Binary file removed thirdparty/linux/miracl/miracl_osmt/source/ec2.o
Binary file not shown.
Binary file removed thirdparty/linux/miracl/miracl_osmt/source/ecn.o
Binary file not shown.
Binary file removed thirdparty/linux/miracl/miracl_osmt/source/flash.o
Binary file not shown.
Binary file removed thirdparty/linux/miracl/miracl_osmt/source/zzn.o
Binary file not shown.