From 647b5c80f611655353042eefac723a0c5a32c9d0 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Sat, 26 Oct 2024 15:36:31 +0400 Subject: [PATCH] fixes related to USE_OPEN_SSL_FOR_ECDSA --- CMakeLists.txt | 4 ++++ src/crypto/eth_signature.cpp | 2 -- tests/functional_tests/crypto_tests.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 099c1fc4..c480300f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,6 +77,10 @@ set(DISABLE_TOR FALSE CACHE BOOL "Disable TOR library(and related tor-connect su set(TESTNET FALSE CACHE BOOL "Compile for testnet") set(BUILD_GUI FALSE CACHE BOOL "Build qt-daemon") set(USE_BITCOIN_SECP256K1_FOR_ECDSA FALSE CACHE BOOL "Use bitcoin-secp256k1 library for validating ECDSA(instead of OpenSSL)") +if(NOT USE_BITCOIN_SECP256K1_FOR_ECDSA) + add_definitions(-DUSE_OPEN_SSL_FOR_ECDSA) +endif() + include_directories(src contrib/eos_portable_archive contrib contrib/epee/include contrib/jwt-cpp/include ${OPENSSL_INCLUDE_DIR} "${CMAKE_BINARY_DIR}/version" "${CMAKE_BINARY_DIR}/contrib/zlib") diff --git a/src/crypto/eth_signature.cpp b/src/crypto/eth_signature.cpp index 972eab3b..c5e0999b 100644 --- a/src/crypto/eth_signature.cpp +++ b/src/crypto/eth_signature.cpp @@ -11,8 +11,6 @@ #include -#define USE_OPEN_SSL_FOR_ECDSA - #ifdef USE_OPEN_SSL_FOR_ECDSA #include #include diff --git a/tests/functional_tests/crypto_tests.cpp b/tests/functional_tests/crypto_tests.cpp index 28a9b18c..599922f2 100644 --- a/tests/functional_tests/crypto_tests.cpp +++ b/tests/functional_tests/crypto_tests.cpp @@ -1966,9 +1966,9 @@ TEST(crypto, generators_precomp) #undef CHECK_PRECOMP } - -#include "bitcoin-secp256k1/include/secp256k1.h" -TEST(crypto, secp256k1_ecdsa_native) +#ifndef USE_OPEN_SSL_FOR_ECDSA + #include "bitcoin-secp256k1/include/secp256k1.h" + TEST(crypto, secp256k1_ecdsa_native) { bool r = false; @@ -2026,7 +2026,7 @@ TEST(crypto, secp256k1_ecdsa_native) secp256k1_context_destroy(ctx); return true; } - +#endif TEST(crypto, eth_signature_basics) {