summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslsocket.cpp
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2021-01-25 15:37:03 +0100
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2021-02-01 14:36:40 +0100
commit1a0da3ae69964142b3a31d87ecc88a925006a4de (patch)
tree88c8f5cd419d3a2aa9e1f42d288321831ec86165 /src/network/ssl/qsslsocket.cpp
parent59252a3a969dcfd07304400f68503a4687292aac (diff)
QSsl::TlsKey - provide the interface and implementations
which will become parts of TLS plugins in the future. Task-number: QTBUG-65922 Change-Id: I4ee3c59c435fc34a9f4dacd3ff0e3cfb44251e23 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
-rw-r--r--src/network/ssl/qsslsocket.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index d2b386d024..ffbb4d61cc 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -1603,7 +1603,7 @@ bool QSslSocket::setActiveBackend(const QString &backendName)
}
QMutexLocker locker(&QSslSocketPrivate::backendMutex);
- if (QSslSocketPrivate::tlsBackend.get()) {
+ if (QSslSocketPrivate::tlsBackend) {
qCWarning(lcSsl) << "Cannot set backend named" << backendName
<< "as active, another backend is already in use";
locker.unlock();
@@ -2832,6 +2832,21 @@ bool QSslSocketPrivate::isMatchingHostname(const QString &cn, const QString &hos
return true;
}
+/*!
+ \internal
+*/
+QTlsBackend *QSslSocketPrivate::tlsBackendInUse()
+{
+ const QMutexLocker locker(&backendMutex);
+ if (tlsBackend)
+ return tlsBackend;
+
+ if (!activeBackendName.size())
+ activeBackendName = QTlsBackend::defaultBackendName();
+
+ return tlsBackend = QTlsBackend::findBackend(activeBackendName);
+}
+
QT_END_NAMESPACE
#include "moc_qsslsocket.cpp"