From 8906dfbea322cdb18e5cfe265dc92b40ec47770f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 15 May 2020 03:11:52 +0200 Subject: [PATCH] Move the OpenSSL 0.97 test inside the source code instead of using the hard-coded definition. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- CMakeLists.txt | 2 +- tqca-tls.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f41a4b5..07a490b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H -DOSSL_097 -DTQCA_PLUGIN ) +add_definitions( -DHAVE_CONFIG_H -DTQCA_PLUGIN ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) diff --git a/tqca-tls.cpp b/tqca-tls.cpp index df9eff1..e17f649 100644 --- a/tqca-tls.cpp +++ b/tqca-tls.cpp @@ -34,6 +34,10 @@ #include #include +#if OPENSSL_VERSION_NUMBER >= 0x00907000 +#define OSSL_097 +#endif + #ifndef OSSL_097 #define NO_AES #endif