From 8a65cd8dcdb08c18230de3b2c73b4d127d6e88c5 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Fri, 12 Jun 2020 10:44:13 +0200 Subject: long_name_onDemandCerts_static - stop testing/using the deprecated API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 5.15 Change-Id: Ia937fc393b2dbc2602a93f2b3a71328a805ec1a6 Reviewed-by: Mårten Nordheim --- .../tst_qsslsocket_onDemandCertificates_static.cpp | 25 ---------------------- 1 file changed, 25 deletions(-) (limited to 'tests') diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp index b4a41b57e6..b71f7cc27b 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp @@ -179,31 +179,6 @@ void tst_QSslSocket_onDemandCertificates_static::onDemandRootCertLoadingStaticMe { QString host("www.qt.io"); -#if QT_DEPRECATED_SINCE(5, 5) - // not using any root certs -> should not work - QSslSocket::setDefaultCaCertificates(QList()); - QSslSocketPtr socket = newSocket(); - this->socket = socket.data(); - socket->connectToHostEncrypted(host, 443); - QVERIFY(!socket->waitForEncrypted()); - - // using system root certs -> should work - QSslSocket::setDefaultCaCertificates(QSslSocket::systemCaCertificates()); - QSslSocketPtr socket2 = newSocket(); - this->socket = socket2.data(); - socket2->connectToHostEncrypted(host, 443); - QVERIFY2(socket2->waitForEncrypted(), qPrintable(socket2->errorString())); - - // not using any root certs again -> should not work - QSslSocket::setDefaultCaCertificates(QList()); - QSslSocketPtr socket3 = newSocket(); - this->socket = socket3.data(); - socket3->connectToHostEncrypted(host, 443); - QVERIFY(!socket3->waitForEncrypted()); - - QSslSocket::setDefaultCaCertificates(QSslSocket::systemCaCertificates()); -#endif - // setting empty default configuration -> should not work QSslConfiguration conf; QSslConfiguration originalDefaultConf = QSslConfiguration::defaultConfiguration(); -- cgit v1.2.3