From 4b282e0602764459805f8250fe27fc465ee33c18 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Tue, 19 Oct 2021 11:09:21 +0200 Subject: TLS plugin (OpenSSL): don't use the deprecated functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If we have OPENSSL_NO_DEPRECATED_3_0 defined. This includes RSA, DSA, EC and DH-related APIs. As of now, we only make sure the code still compiles. Pick-to: 6.2 5.15 Fixes: QTBUG-83733 Change-Id: Id455b851421ce0dcdfb0229fa515ba2b2ed690b1 Reviewed-by: Mårten Nordheim --- src/plugins/tls/openssl/qsslcontext_openssl.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/plugins/tls/openssl/qsslcontext_openssl.cpp') diff --git a/src/plugins/tls/openssl/qsslcontext_openssl.cpp b/src/plugins/tls/openssl/qsslcontext_openssl.cpp index 54d749b147..0ed0590409 100644 --- a/src/plugins/tls/openssl/qsslcontext_openssl.cpp +++ b/src/plugins/tls/openssl/qsslcontext_openssl.cpp @@ -734,6 +734,7 @@ QT_WARNING_POP } if (!dhparams.isEmpty()) { +#ifndef OPENSSL_NO_DEPRECATED_3_0 const QByteArray ¶ms = dhparams.d->derData; const char *ptr = params.constData(); DH *dh = q_d2i_DHparams(nullptr, reinterpret_cast(&ptr), @@ -742,6 +743,9 @@ QT_WARNING_POP qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form"); q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh); q_DH_free(dh); +#else + qCWarning(lcTlsBackend, "Diffie-Hellman parameters are not supported, because OpenSSL v3 was built with deprecated API removed"); +#endif } #ifndef OPENSSL_NO_PSK -- cgit v1.2.3