diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-01-25 11:28:48 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-01-28 16:21:07 +0100 |
| commit | 1a2dd9276759742a7eda704341ee618d296ad8bf (patch) | |
| tree | d6d0b7f8cf473c2d682aeae12bc2bad0680ace0b /src/network/ssl/qsslsocket.cpp | |
| parent | 795ea19ca0a7e484793655b35f19de8dbc88e987 (diff) | |
TLS backend: merge with its factory
QTlsBackend is a factory itself - it creates TLS/X509 objects. Having
an intermediary between Factory->Backend->TLS primitive does not look
very natural thus let's squash the first two parts. Backend is a factory
creating TLS primitives, but its static functions also provide information
about backends availablei and give access to those backends.
Fixes: QTBUG-90606
Task-number: QTBUG-65922
Change-Id: I8409d81fd11fb46e6ab4465b4937a7680a8c2447
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 0c231c1600..d2b386d024 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1557,7 +1557,7 @@ QString QSslSocket::sslLibraryBuildVersionString() */ QList<QString> QSslSocket::availableBackends() { - return QTlsBackendFactory::availableBackendNames(); + return QTlsBackend::availableBackendNames(); } /*! @@ -1577,7 +1577,7 @@ QString QSslSocket::activeBackend() const QMutexLocker locker(&QSslSocketPrivate::backendMutex); if (!QSslSocketPrivate::activeBackendName.size()) - QSslSocketPrivate::activeBackendName = QTlsBackendFactory::defaultBackendName(); + QSslSocketPrivate::activeBackendName = QTlsBackend::defaultBackendName(); return QSslSocketPrivate::activeBackendName; } @@ -1610,7 +1610,7 @@ bool QSslSocket::setActiveBackend(const QString &backendName) return activeBackend() == backendName; } - if (!QTlsBackendFactory::availableBackendNames().contains(backendName)) { + if (!QTlsBackend::availableBackendNames().contains(backendName)) { qCWarning(lcSsl) << "Cannot set unavailable backend named" << backendName << "as active"; return false; @@ -1632,7 +1632,7 @@ bool QSslSocket::setActiveBackend(const QString &backendName) */ QList<QSsl::SslProtocol> QSslSocket::supportedProtocols(const QString &backendName) { - return QTlsBackendFactory::supportedProtocols(backendName.size() ? backendName : activeBackend()); + return QTlsBackend::supportedProtocols(backendName.size() ? backendName : activeBackend()); } /*! @@ -1658,7 +1658,7 @@ bool QSslSocket::isProtocolSupported(QSsl::SslProtocol protocol, const QString & */ QList<QSsl::ImplementedClass> QSslSocket::implementedClasses(const QString &backendName) { - return QTlsBackendFactory::implementedClasses(backendName.size() ? backendName : activeBackend()); + return QTlsBackend::implementedClasses(backendName.size() ? backendName : activeBackend()); } /*! @@ -1683,7 +1683,7 @@ bool QSslSocket::isClassImplemented(QSsl::ImplementedClass cl, const QString &ba */ QList<QSsl::SupportedFeature> QSslSocket::supportedFeatures(const QString &backendName) { - return QTlsBackendFactory::supportedFeatures(backendName.size() ? backendName : activeBackend()); + return QTlsBackend::supportedFeatures(backendName.size() ? backendName : activeBackend()); } /*! |