summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/ssl
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/ssl')
-rw-r--r--tests/auto/network/ssl/qdtls/tst_qdtls.cpp2
-rw-r--r--tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp5
-rw-r--r--tests/auto/network/ssl/shared/tlshelpers.h18
3 files changed, 12 insertions, 13 deletions
diff --git a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
index d11fc6e99a..dd380923df 100644
--- a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
+++ b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
@@ -171,7 +171,7 @@ QT_BEGIN_NAMESPACE
void tst_QDtls::initTestCase()
{
- if (!TlsAux::activeBackendSupportsDtls())
+ if (!TlsAux::classImplemented(QSsl::ImplementedClass::Dtls))
QSKIP("The active TLS backend does not support DTLS");
certDirPath = QFileInfo(QFINDTESTDATA("certs")).absolutePath();
diff --git a/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp b/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
index 18efc82491..42b51ad413 100644
--- a/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
+++ b/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
@@ -141,7 +141,10 @@ QHostAddress tst_QDtlsCookie::toNonAny(const QHostAddress &addr)
void tst_QDtlsCookie::initTestCase()
{
- if (!TlsAux::activeBackendSupportsDtls())
+ using TlsCl = QSsl::ImplementedClass;
+ using TlsAux::classImplemented;
+
+ if (!classImplemented(TlsCl::DtlsCookie) || !classImplemented(TlsCl::Dtls))
QSKIP("The active TLS backend does not support DTLS");
QVERIFY(noiseMaker.bind());
diff --git a/tests/auto/network/ssl/shared/tlshelpers.h b/tests/auto/network/ssl/shared/tlshelpers.h
index 490f9af89e..cd0f785aee 100644
--- a/tests/auto/network/ssl/shared/tlshelpers.h
+++ b/tests/auto/network/ssl/shared/tlshelpers.h
@@ -42,24 +42,20 @@
QT_BEGIN_NAMESPACE
-#if QT_CONFIG(ssl)
+
namespace TlsAux {
-inline bool activeBackendSupportsDtls()
+inline bool classImplemented(QSsl::ImplementedClass cl)
{
- // In case Qt was built with OpenSSL (the only DTLS-capable backend
- // at the moment) and some other backend, and later when running
- // the test OpenSSL library is not available, skip the whole
- // test.
- // IMPORTANT: extend this definition, if a new backend supporting
- // DTLS is introduced or if one of the already-supported backends
- // adds DTLS support.
- return QSslSocket::activeBackend() == QStringLiteral("openssl");
+#if QT_CONFIG(ssl)
+ return QSslSocket::implementedClasses().contains(cl);
+#endif
+ return cl == QSsl::ImplementedClass::Certificate; // This is the only thing our 'cert-only' supports.
}
} // namespace TlsAux
-#endif // QT_CONFIG(ssl)
+
QT_END_NAMESPACE