diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-03-04 19:20:18 +0100 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-03-17 16:25:37 +0100 |
commit | b477d823ada32f81457044c292af4099a6099cea (patch) | |
tree | 3beda1f80c21f79672215ea5d37a4414d62e41a3 /src/network/ssl/qssldiffiehellmanparameters_openssl.cpp | |
parent | fac23d695f9b9f9b172467eaa7f94102dac4dc25 (diff) |
Convert QSslSocket(Backend)Private into plugin
All backend-specific code is now separated and removed
from QSslSocket(Private) code. The original code is mostly
preserved to avoid (as much as possible) regressions (and
to simplify code-review).
Fixes: QTBUG-91173
Task-number: QTBUG-65922
Change-Id: I3ac4ba35d952162c8d6dc62d747cbd62dca0ef78
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 9391ba55149336c395b866b24dc9b844334d50da)
Diffstat (limited to 'src/network/ssl/qssldiffiehellmanparameters_openssl.cpp')
-rw-r--r-- | src/network/ssl/qssldiffiehellmanparameters_openssl.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp b/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp index 01dca50720..8e0458de4e 100644 --- a/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp +++ b/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp @@ -69,22 +69,22 @@ int q_DH_check(DH *dh, int *status) EVP_PKEY *key = q_EVP_PKEY_new(); if (!key) { qCWarning(lcSsl, "EVP_PKEY_new failed"); - QSslSocketBackendPrivate::logAndClearErrorQueue(); + QTlsBackendOpenSSL::logAndClearErrorQueue(); return 0; } const auto keyDeleter = qScopeGuard([key](){ q_EVP_PKEY_free(key); }); if (!q_EVP_PKEY_set1_DH(key, dh)) { - qCWarning(lcSsl, "EVP_PKEY_set1_DH failed"); - QSslSocketBackendPrivate::logAndClearErrorQueue(); + qCWarning(lcTlsBackend, "EVP_PKEY_set1_DH failed"); + QTlsBackendOpenSSL::logAndClearErrorQueue(); return 0; } EVP_PKEY_CTX *keyCtx = q_EVP_PKEY_CTX_new(key, nullptr); if (!keyCtx) { - qCWarning(lcSsl, "EVP_PKEY_CTX_new failed"); - QSslSocketBackendPrivate::logAndClearErrorQueue(); + qCWarning(lcTlsBackend, "EVP_PKEY_CTX_new failed"); + QTlsBackendOpenSSL::logAndClearErrorQueue(); return 0; } const auto ctxDeleter = qScopeGuard([keyCtx]{ @@ -92,7 +92,7 @@ int q_DH_check(DH *dh, int *status) }); const int result = q_EVP_PKEY_param_check(keyCtx); - QSslSocketBackendPrivate::logAndClearErrorQueue(); + QTlsBackendOpenSSL::logAndClearErrorQueue(); // Note: unlike DH_check, we cannot obtain the 'status', // if the 'result' is 0 (actually the result is 1 only // if this 'status' was 0). We could probably check the |