From e4fd86a6d4eae9f0ca0bf92ae14303f1c3f627c1 Mon Sep 17 00:00:00 2001 From: "Timur A. Fatkhullin" Date: Thu, 12 Dec 2024 21:34:12 +0300 Subject: [PATCH] fix compilation with OPENSSL_LIBRARY=0 --- CMakeLists.txt | 4 +++- net/asio/adc_netservice_asio.h | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index adf41fe..3afeec9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,7 +172,9 @@ if (BUILD_TESTS) set(NETSERVICE_TEST_APP adc_netservice_test) add_executable(${NETSERVICE_TEST_APP} tests/adc_netservice_test.cpp) - target_link_libraries(${NETSERVICE_TEST_APP} OpenSSL::SSL OpenSSL::Crypto) + if (OPENSSL_LIBRARY) + target_link_libraries(${NETSERVICE_TEST_APP} OpenSSL::SSL OpenSSL::Crypto) + endif() if (ASIO_LIBRARY) find_package(cxxopts CONFIG) diff --git a/net/asio/adc_netservice_asio.h b/net/asio/adc_netservice_asio.h index 9140bf8..c5fa1e6 100644 --- a/net/asio/adc_netservice_asio.h +++ b/net/asio/adc_netservice_asio.h @@ -159,7 +159,8 @@ public: typedef std::function& fingerprint, int depth)> cert_comp_func_t; #else - using session_level_socket_t = socket_t; + // using session_level_socket_t = socket_t; + using session_level_socket_t = std::nullptr_t; #endif @@ -830,8 +831,8 @@ protected: asio::socket_base::shutdown_type _shutdownType = asio::socket_base::shutdown_both; -#ifdef USE_OPENSSL_WITH_ASIO session_level_socket_t _sessSocket; +#ifdef USE_OPENSSL_WITH_ASIO std::conditional_t _tlsContext; asio::ssl::verify_mode _tlsPeerVerifyMode; cert_comp_func_t _tlsCertCompFunc;