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

Fix the qopenssl_symbols.h copy in the autotest

Browse Source 
It was forgotten when we originally fixed the hardcoded 1_1 version.

Pick-to: 6.6 6.5
Change-Id: Iff3148d79466dac2830fe9a63d954aead96fb0ac
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 46923f2648ba99b3d070ea077f04047172ba4923)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2023-12-13 14:02:11 +01:00 committed by Qt Cherry-pick Bot
parent d26be2a206
commit 6b228565cf
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/auto/network/ssl/shared/qopenssl_symbols.h
View File

@ -502,6 +502,12 @@ QStringList findAllLibCrypto()
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#if (OPENSSL_VERSION_NUMBER >> 28) < 3
#define QT_OPENSSL_VERSION "1_1"
#elif OPENSSL_VERSION_MAJOR == 3 // Starting with 3.0 this define is available
#define QT_OPENSSL_VERSION "3"
#endif // > 3 intentionally left undefined
struct LoadedOpenSsl { struct LoadedOpenSsl {
std::unique_ptr<QSystemLibrary> ssl, crypto; std::unique_ptr<QSystemLibrary> ssl, crypto;
}; };
@ -540,8 +546,9 @@ static LoadedOpenSsl loadOpenSsl()
#define QT_SSL_SUFFIX #define QT_SSL_SUFFIX
#endif #endif
tryToLoadOpenSslWin32Library(QLatin1String("libssl-1_1" QT_SSL_SUFFIX), tryToLoadOpenSslWin32Library(QLatin1String("libssl-" QT_OPENSSL_VERSION QT_SSL_SUFFIX),
QLatin1String("libcrypto-1_1" QT_SSL_SUFFIX), result); QLatin1String("libcrypto-" QT_OPENSSL_VERSION QT_SSL_SUFFIX),
result);
#undef QT_SSL_SUFFIX #undef QT_SSL_SUFFIX
return result; return result;