summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qtlsbackend_openssl.cpp
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2021-02-19 15:52:36 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-22 13:00:56 +0000
commit9e5d7af6ef6ead63d653853ec5ece2d46d026a5a (patch)
tree0d80f339430f74e3ba47edd5894e26bc9fb7c9de /src/network/ssl/qtlsbackend_openssl.cpp
parentf265736e9fdce7e9d049774f2e9f648f52aef31f (diff)
A follow-up fix for potentially missing OpenSSL symbol resolving
This patch also adds 'isValid()' to know if a backend from a plugin is in working condition (say, there is 'openssl' plugin but no or old openssl libraries in some system). Task-number: QTBUG-65922 Change-Id: I0b846536a069ca8c5a94e7191f11c81bac6ad527 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 573ba145d76f239dbc7464a78aabc06ed4d00419) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/network/ssl/qtlsbackend_openssl.cpp')
-rw-r--r--src/network/ssl/qtlsbackend_openssl.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/network/ssl/qtlsbackend_openssl.cpp b/src/network/ssl/qtlsbackend_openssl.cpp
index b0dd920aed..e288498820 100644
--- a/src/network/ssl/qtlsbackend_openssl.cpp
+++ b/src/network/ssl/qtlsbackend_openssl.cpp
@@ -41,6 +41,10 @@
#include "qtlskey_openssl_p.h"
#include "qx509_openssl_p.h"
+// TLSTODO: Later, this code (ensure initialised, etc.)
+// must move from the socket to backend.
+#include "qsslsocket_p.h"
+//
#include "qsslsocket_openssl_symbols_p.h"
#include <qssl.h>
@@ -83,6 +87,13 @@ QString QTlsBackendOpenSSL::backendName() const
return builtinBackendNames[nameIndexOpenSSL];
}
+bool QTlsBackendOpenSSL::isValid() const
+{
+ // TLSTODO: backend should do initialization,
+ // not socket.
+ return QSslSocket::supportsSsl();
+}
+
QList<QSsl::SslProtocol> QTlsBackendOpenSSL::supportedProtocols() const
{
QList<QSsl::SslProtocol> protocols;