KSSL: Add names for OpenSSL 3.x libraries to SSL libraries search.

Use OPENSSL_SHLIB_VERSION for default libraries version.

This relates to issue #176.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit cb87252f7d)
r14.0.x
Slávek Banko 2 years ago
parent cb2e9feebc
commit 2318093ca7
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -33,6 +33,8 @@
#include <unistd.h> #include <unistd.h>
#include "kopenssl.h" #include "kopenssl.h"
#define STRINGIFY(x) #x
#define GET_CRYPTOLIB_SYMBOL(a) ((_cryptoLib->hasSymbol(a)) ? _cryptoLib->symbol(a) : NULL) #define GET_CRYPTOLIB_SYMBOL(a) ((_cryptoLib->hasSymbol(a)) ? _cryptoLib->symbol(a) : NULL)
#define GET_SSLLIB_SYMBOL(a) ((_sslLib->hasSymbol(a)) ? _sslLib->symbol(a) : NULL) #define GET_SSLLIB_SYMBOL(a) ((_sslLib->hasSymbol(a)) ? _sslLib->symbol(a) : NULL)
@ -345,8 +347,8 @@ TDEConfig *cfg;
<< ""; << "";
#else #else
libpaths libpaths
#ifdef _AIX #ifdef _AIX
<< "/opt/freeware/lib/" << "/opt/freeware/lib/"
#endif #endif
<< "/usr/" SYSTEM_LIBDIR "/" << "/usr/" SYSTEM_LIBDIR "/"
<< "/usr/ssl/" SYSTEM_LIBDIR "/" << "/usr/ssl/" SYSTEM_LIBDIR "/"
@ -355,41 +357,49 @@ TDEConfig *cfg;
<< "/usr/local/ssl/" SYSTEM_LIBDIR "/" << "/usr/local/ssl/" SYSTEM_LIBDIR "/"
<< "/opt/openssl/" SYSTEM_LIBDIR "/" << "/opt/openssl/" SYSTEM_LIBDIR "/"
<< "/" SYSTEM_LIBDIR "/" << "/" SYSTEM_LIBDIR "/"
<< ""; << "";
// FIXME: #define here for the various OS types to optimize // FIXME: #define here for the various OS types to optimize
libnamess libnamess
#ifdef hpux #ifdef hpux
<< "libssl.sl" << "libssl.sl"
#elif defined(_AIX) #elif defined(_AIX)
<< "libssl.a(libssl.so.0)" << "libssl.a(libssl.so.0)"
#elif defined(__APPLE__) #elif defined(__APPLE__)
<< "libssl.dylib" << "libssl.dylib"
<< "libssl.0.9.dylib" << "libssl.0.9.dylib"
#else #else
#ifdef SHLIB_VERSION_NUMBER #ifdef OPENSSL_SHLIB_VERSION
<< "libssl.so." SHLIB_VERSION_NUMBER << "libssl.so." STRINGIFY(OPENSSL_SHLIB_VERSION)
#endif #endif
<< "libssl.so" #ifdef SHLIB_VERSION_NUMBER
<< "libssl.so.0" << "libssl.so." SHLIB_VERSION_NUMBER
#endif #endif
<< "libssl.so"
<< "libssl.so.3"
<< "libssl.so.0"
#endif
; ;
libnamesc libnamesc
#ifdef hpux #ifdef hpux
<< "libcrypto.sl" << "libcrypto.sl"
#elif defined(_AIX) #elif defined(_AIX)
<< "libcrypto.a(libcrypto.so.0)" << "libcrypto.a(libcrypto.so.0)"
#elif defined(__APPLE__) #elif defined(__APPLE__)
<< "libcrypto.dylib" << "libcrypto.dylib"
<< "libcrypto.0.9.dylib" << "libcrypto.0.9.dylib"
#else #else
#ifdef SHLIB_VERSION_NUMBER #ifdef OPENSSL_SHLIB_VERSION
<< "libcrypto.so." SHLIB_VERSION_NUMBER << "libcrypto.so." STRINGIFY(OPENSSL_SHLIB_VERSION)
#endif #endif
<< "libcrypto.so" #ifdef SHLIB_VERSION_NUMBER
<< "libcrypto.so.0" << "libcrypto.so." SHLIB_VERSION_NUMBER
#endif #endif
<< "libcrypto.so"
<< "libcrypto.so.3"
<< "libcrypto.so.0"
#endif
; ;
#endif #endif

Loading…
Cancel
Save