diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-10-19 11:09:21 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-10-21 12:58:05 +0200 |
| commit | 4b282e0602764459805f8250fe27fc465ee33c18 (patch) | |
| tree | c0ac39001d44b5d31a55151f31f80a2c63dd5c51 /src/plugins/tls/openssl/qsslcontext_openssl.cpp | |
| parent | 4748369eb2e458e12f5228a113b9a6dda440b24b (diff) | |
TLS plugin (OpenSSL): don't use the deprecated functions
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 <marten.nordheim@qt.io>
Diffstat (limited to 'src/plugins/tls/openssl/qsslcontext_openssl.cpp')
| -rw-r--r-- | src/plugins/tls/openssl/qsslcontext_openssl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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<const unsigned char **>(&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 |