diff options
| author | Jannis Voelker <jannis.voelker@basyskom.com> | 2024-01-09 12:19:57 +0100 |
|---|---|---|
| committer | Jannis Völker <jannis.voelker@basyskom.com> | 2024-01-09 11:53:24 +0000 |
| commit | ab133ff52ae19d216b83ec2c16a475463e55ec8d (patch) | |
| tree | 087cc9d59def64409680d689726bc3b1027eb9ca | |
| parent | aae92df4860596924d980a9a620ac76a6c692d48 (diff) | |
Fix OpenSSL library suffix for Android
We only support OpenSSL 3 now, so the default suffix
for the Android OpenSSL libraries should be set to _3.
Change-Id: I80b4034a3b40d1c59e12f305aef01211f0c7e4d3
Pick-to: 6.7
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| -rw-r--r-- | src/opcua/x509/openssl_symbols.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opcua/x509/openssl_symbols.cpp b/src/opcua/x509/openssl_symbols.cpp index 099020c..7831c79 100644 --- a/src/opcua/x509/openssl_symbols.cpp +++ b/src/opcua/x509/openssl_symbols.cpp @@ -698,14 +698,14 @@ static LoadedOpenSsl loadOpenSsl() // attempt, _after_ <bundle>/Contents/Frameworks has been searched. // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. # if defined(Q_OS_ANDROID) - // OpenSSL 1.1.x must be suffixed otherwise it will use the system libcrypto.so libssl.so which on API-21 are OpenSSL 1.0 not 1.1 + // OpenSSL 3.x.x must be suffixed in order to be able to find the right OpenSSL libraries auto openSSLSuffix = [](const QByteArray &defaultSuffix = {}) { auto suffix = qgetenv("ANDROID_OPENSSL_SUFFIX"); if (suffix.isEmpty()) return defaultSuffix; return suffix; }; - static QString suffix = QString::fromLatin1(openSSLSuffix("_1_1")); + static QString suffix = QString::fromLatin1(openSSLSuffix("_3")); libssl->setFileNameAndVersion(QLatin1String("ssl") + suffix, -1); libcrypto->setFileNameAndVersion(QLatin1String("crypto") + suffix, -1); # else |