Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix cryptopp missing headers and add its include path (#4189)

Browse source
This commit is contained in:
Thiago Silva 2023-03-20 20:08:04 -03:00 • committed by GitHub
commit 6eca8c5da0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -548,6 +548,7 @@ add_definitions(-DCRYPTOPP_DISABLE_CLMUL)
set(CRYPTOPP_LIBRARY cryptopp)
add_library(
cryptopp
submodules/cryptopp/aes.h
submodules/cryptopp/algparam.cpp
submodules/cryptopp/allocate.cpp
submodules/cryptopp/asn.cpp
@ -570,11 +571,14 @@ add_library(
submodules/cryptopp/hrtimer.cpp
submodules/cryptopp/integer.cpp
submodules/cryptopp/iterhash.cpp
submodules/cryptopp/misc.h
submodules/cryptopp/misc.cpp
submodules/cryptopp/modes.h
submodules/cryptopp/modes.cpp
submodules/cryptopp/mqueue.cpp
submodules/cryptopp/nbtheory.cpp
submodules/cryptopp/oaep.cpp
submodules/cryptopp/osrng.h
submodules/cryptopp/osrng.cpp
submodules/cryptopp/pubkey.cpp
submodules/cryptopp/queue.cpp
@ -587,8 +591,13 @@ add_library(
submodules/cryptopp/sha_simd.cpp
submodules/cryptopp/simple.cpp
submodules/cryptopp/sse_simd.cpp
submodules/cryptopp/seckey.h
submodules/cryptopp/siphash.h
submodules/cryptopp/words.h
${CRYPTOPP_EXTRA})
target_include_directories(cryptopp PUBLIC submodules)
if(WIN32 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
set(ARGON_CORE submodules/phc-winner-argon2/src/opt.c)
else()

4
nano/crypto_lib/random_pool.cpp
View file

@ -1,7 +1,7 @@
#include <nano/crypto_lib/random_pool.hpp>
#include <submodules/cryptopp/misc.h>
#include <submodules/cryptopp/osrng.h>
#include <cryptopp/misc.h>
#include <cryptopp/osrng.h>
void nano::random_pool::generate_block (unsigned char * output, size_t size)
{