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

QSsl[OpenSSL/Android]: Fix hardcoded 1_1 suffix

Browse Source 
Since we support 3 as well now we should not always use 1_1.
The suffix will change depending on which OpenSSL version was used when
Qt was built.
This only affects Android.

Pick-to: 6.4 6.2 5.15
Change-Id: I2e443b12daa5e79190f1b3367e21ba0fa6a1dcd4
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Mårten Nordheim 2022-10-31 14:21:02 +01:00
parent c45cb7f0cc
commit 528b03d6b6
1 changed files with 8 additions and 8 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

@ -639,6 +639,12 @@ static QStringList findAllLibCrypto()
} }
# endif # endif
#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
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
struct LoadedOpenSsl { struct LoadedOpenSsl {
@ -670,12 +676,6 @@ static LoadedOpenSsl loadOpenSsl()
// MSVC and GCC. For 3.0 the version suffix changed again, to just '3'. // MSVC and GCC. For 3.0 the version suffix changed again, to just '3'.
// For non-x86 builds, an architecture suffix is also appended. // For non-x86 builds, an architecture suffix is also appended.
#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
#if defined(Q_PROCESSOR_X86_64) #if defined(Q_PROCESSOR_X86_64)
#define QT_SSL_SUFFIX "-x64" #define QT_SSL_SUFFIX "-x64"
#elif defined(Q_PROCESSOR_ARM_64) #elif defined(Q_PROCESSOR_ARM_64)
@ -692,7 +692,7 @@ static LoadedOpenSsl loadOpenSsl()
#undef QT_SSL_SUFFIX #undef QT_SSL_SUFFIX
return result; return result;
} }
#else #else // !Q_OS_WIN:
struct LoadedOpenSsl { struct LoadedOpenSsl {
std::unique_ptr<QLibrary> ssl, crypto; std::unique_ptr<QLibrary> ssl, crypto;
@ -771,7 +771,7 @@ static LoadedOpenSsl loadOpenSsl()
return suffix; return suffix;
}; };
static QString suffix = QString::fromLatin1(openSSLSuffix("_1_1")); static QString suffix = QString::fromLatin1(openSSLSuffix("_" QT_OPENSSL_VERSION));
libssl->setFileNameAndVersion("ssl"_L1 + suffix, -1); libssl->setFileNameAndVersion("ssl"_L1 + suffix, -1);
libcrypto->setFileNameAndVersion("crypto"_L1 + suffix, -1); libcrypto->setFileNameAndVersion("crypto"_L1 + suffix, -1);