From 88bdd17f06fbd902316894303f40a6aa526608c2 Mon Sep 17 00:00:00 2001 From: Cekis Date: Mon, 1 Nov 2021 00:30:09 -0400 Subject: [PATCH] Compiling 100% - Execution still broken - DataTable tool may need adjustment --- external/ours/library/crypto/CMakeLists.txt | 1 + .../ours/library/crypto/src/CMakeLists.txt | 29 +++++++++++++++++++ .../crypto/src/shared/wrapper/TwofishCrypt.h | 5 +++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/external/ours/library/crypto/CMakeLists.txt b/external/ours/library/crypto/CMakeLists.txt index 58533e03..13ad4e44 100644 --- a/external/ours/library/crypto/CMakeLists.txt +++ b/external/ours/library/crypto/CMakeLists.txt @@ -7,6 +7,7 @@ if(WIN32) endif() add_definitions(-DCRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) +add_definitions(-DCRYPTOPP_DISABLE_SHANI) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/external/ours/library/crypto/src/CMakeLists.txt b/external/ours/library/crypto/src/CMakeLists.txt index c9789cf5..b8a4bde2 100644 --- a/external/ours/library/crypto/src/CMakeLists.txt +++ b/external/ours/library/crypto/src/CMakeLists.txt @@ -12,12 +12,16 @@ set(SHARED_SOURCES shared/original/asn.cpp shared/original/asn.h shared/original/config.h + shared/original/cpu.cpp + shared/original/cpu.h shared/original/cryptlib.cpp shared/original/cryptlib.h shared/original/filters.cpp shared/original/filters.h shared/original/fips140.cpp shared/original/fips140.h + shared/original/hmac.cpp + shared/original/hmac.h shared/original/integer.cpp shared/original/integer.h shared/original/iterhash.cpp @@ -28,9 +32,34 @@ set(SHARED_SOURCES shared/original/misc.h shared/original/mqueue.cpp shared/original/mqueue.h + shared/original/nbtheory.cpp + shared/original/nbtheory.h + shared/original/osrng.cpp + shared/original/osrng.h + shared/original/pch.cpp + shared/original/pch.h + shared/original/pubkey.cpp + shared/original/pubkey.h shared/original/queue.cpp shared/original/queue.h + shared/original/rc2.cpp + shared/original/rc2.h + shared/original/rdtables.cpp + shared/original/rijndael.cpp + shared/original/rijndael.h + shared/original/rijndael_simd.cpp + shared/original/rng.cpp + shared/original/rng.h + shared/original/seckey.h + shared/original/sha.cpp + shared/original/sha.h + shared/original/sha3.cpp + shared/original/sha3.h + shared/original/shacal2.cpp + shared/original/shacal2.h + shared/original/sha_simd.cpp shared/original/smartptr.h + shared/original/sse_simd.cpp shared/original/tftables.cpp shared/original/twofish.cpp shared/original/twofish.h diff --git a/external/ours/library/crypto/src/shared/wrapper/TwofishCrypt.h b/external/ours/library/crypto/src/shared/wrapper/TwofishCrypt.h index c16124f3..9ecd1f22 100755 --- a/external/ours/library/crypto/src/shared/wrapper/TwofishCrypt.h +++ b/external/ours/library/crypto/src/shared/wrapper/TwofishCrypt.h @@ -29,7 +29,10 @@ public: { } - virtual ~TwofishCrypt() = 0; + virtual ~TwofishCrypt() + { + delete cipher; + } enum {