1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Openssl V3: try to work around the lack of SHLIB_VERSION_NUMBER

Browse Source 
It's no more defined in opensslv.h, try to use OPENSSL_SHLIB_VERSION
instead.

Pick-to: 6.5
Fixes: QTBUG-116295
Change-Id: Ie465f4147e0ec95897bd8d35f71241884bf64b4e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 3159b337f01767412f51c649d30a72ac8417989b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Timur Pocheptsov 2023-11-07 10:52:49 +01:00 committed by Qt Cherry-pick Bot
parent 4253b2b6e7
commit 1b4301c979
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
View File

@ -749,10 +749,22 @@ static LoadedOpenSsl loadOpenSsl()
#ifdef Q_OS_OPENBSD #ifdef Q_OS_OPENBSD
libcrypto->setLoadHints(QLibrary::ExportExternalSymbolsHint); libcrypto->setLoadHints(QLibrary::ExportExternalSymbolsHint);
#endif #endif
#if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
#if !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
#if defined(OPENSSL_SHLIB_VERSION)
// OpenSSL v.3 does not have SLIB_VERSION_NUMBER but has OPENSSL_SHLIB_VERSION.
// The comment about OPENSSL_SHLIB_VERSION in opensslv.h is a bit troublesome:
// "This is defined in free form."
auto shlibVersion = QString("%1"_L1).arg(OPENSSL_SHLIB_VERSION).toLatin1();
libssl->setFileNameAndVersion("ssl"_L1, shlibVersion);
libcrypto->setFileNameAndVersion("crypto"_L1, shlibVersion);
#elif defined(SHLIB_VERSION_NUMBER)
// first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
libssl->setFileNameAndVersion("ssl"_L1, SHLIB_VERSION_NUMBER ""_L1); libssl->setFileNameAndVersion("ssl"_L1, SHLIB_VERSION_NUMBER ""_L1);
libcrypto->setFileNameAndVersion("crypto"_L1, SHLIB_VERSION_NUMBER ""_L1); libcrypto->setFileNameAndVersion("crypto"_L1, SHLIB_VERSION_NUMBER ""_L1);
#endif // OPENSSL_SHLIB_VERSION
if (libcrypto->load() && libssl->load()) { if (libcrypto->load() && libssl->load()) {
// libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
return result; return result;
@ -760,7 +772,7 @@ static LoadedOpenSsl loadOpenSsl()
libssl->unload(); libssl->unload();
libcrypto->unload(); libcrypto->unload();
} }
#endif #endif // !defined(Q_OS_QNX)
#ifndef Q_OS_DARWIN #ifndef Q_OS_DARWIN
// second attempt: find the development files libssl.so and libcrypto.so // second attempt: find the development files libssl.so and libcrypto.so