diff options
| author | Marianne Yrjänä <marianne.yrjana@qt.io> | 2023-11-30 10:24:41 +0000 |
|---|---|---|
| committer | Marianne Yrjänä <marianne.yrjana@qt.io> | 2023-12-08 06:10:51 +0000 |
| commit | 65081c67f3d65b1c6e7e051a1b9d008eca3381e5 (patch) | |
| tree | 1e7794400b87e55943f29092eaf5559e57179927 /src/plugins/tls/openssl/qsslcontext_openssl.cpp | |
| parent | e240f559e4a3b1a122c3bd0c4dc743487189ccfd (diff) | |
Revert "OpenSSL: remove support for 1.1"
This reverts commit d201c0a2184881a226bce76528047707e9062856.
Reason for revert: QNX have support only for OpenSSL1.1.
QNX will start supporting OpenSSL3 with upcoming QNX8.0 but as long as we want to support QNX7.1 (and even QNX7.0) removing OpenSSL1.1 support from Qt is not an option.
Change-Id: Ia2083eda318779968eb6ee84fff2f56ebe3dadf7
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/tls/openssl/qsslcontext_openssl.cpp')
| -rw-r--r-- | src/plugins/tls/openssl/qsslcontext_openssl.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/tls/openssl/qsslcontext_openssl.cpp b/src/plugins/tls/openssl/qsslcontext_openssl.cpp index a06d2ff65b..75c192bd01 100644 --- a/src/plugins/tls/openssl/qsslcontext_openssl.cpp +++ b/src/plugins/tls/openssl/qsslcontext_openssl.cpp @@ -555,10 +555,17 @@ QT_WARNING_POP // tell OpenSSL the directories where to look up the root certs on demand const QList<QByteArray> unixDirs = QSslSocketPrivate::unixRootCertDirectories(); int success = 1; +#if OPENSSL_VERSION_MAJOR < 3 + for (const QByteArray &unixDir : unixDirs) { + if ((success = q_SSL_CTX_load_verify_locations(sslContext->ctx, nullptr, unixDir.constData())) != 1) + break; + } +#else for (const QByteArray &unixDir : unixDirs) { if ((success = q_SSL_CTX_load_verify_dir(sslContext->ctx, unixDir.constData())) != 1) break; } +#endif // OPENSSL_VERSION_MAJOR if (success != 1) { const auto qtErrors = QTlsBackendOpenSSL::getErrorsFromOpenSsl(); qCWarning(lcTlsBackend) << "An error encountered while to set root certificates location:" |