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/qtls_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/qtls_openssl.cpp')
| -rw-r--r-- | src/plugins/tls/openssl/qtls_openssl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/tls/openssl/qtls_openssl.cpp b/src/plugins/tls/openssl/qtls_openssl.cpp index ed5211150de..57d09a649b1 100644 --- a/src/plugins/tls/openssl/qtls_openssl.cpp +++ b/src/plugins/tls/openssl/qtls_openssl.cpp @@ -1438,11 +1438,14 @@ bool TlsCryptographOpenSSL::initSslContext() else if (mode == QSslSocket::SslServerMode) q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); +#if OPENSSL_VERSION_NUMBER >= 0x10101006L // Set the client callback for TLSv1.3 PSK if (mode == QSslSocket::SslClientMode && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { q_SSL_set_psk_use_session_callback(ssl, &q_ssl_psk_use_session_callback); } +#endif // openssl version >= 0x10101006L + #endif // OPENSSL_NO_PSK #if QT_CONFIG(ocsp) |