diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-05-15 03:11:52 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-05-17 16:55:18 +0200 |
| commit | 6601055e9ee66eb415be66d8eaf67de447402c4b (patch) | |
| tree | ebd99f1340b48abca841cc03721a12c439397b89 | |
| parent | c0c3393c7bca3d3e340b598825c84b90ee91949f (diff) | |
| download | tqca-tls-6601055e9ee66eb415be66d8eaf67de447402c4b.tar.gz tqca-tls-6601055e9ee66eb415be66d8eaf67de447402c4b.zip | |
Move the OpenSSL 0.97 test inside the source code
instead of using the hard-coded definition.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8906dfbea322cdb18e5cfe265dc92b40ec47770f)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tqca-tls.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 718637b..f38db06 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 <openssl/err.h> #include <openssl/rand.h> +#if OPENSSL_VERSION_NUMBER >= 0x00907000 +#define OSSL_097 +#endif + #ifndef OSSL_097 #define NO_AES #endif |