From 4dc390e66fefc850cf84292549285a359e2ad8e6 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Mon, 14 Nov 2011 12:33:55 +0100 Subject: SSL namespace: rename TlsV1 to TlsV1_0 This is a source-incompatible change. TlsV1 is ambiguous; what is actually meant is TLS version 1.0. There are also TLS versions 1.1 and 1.2; we might want to add options for these once OpenSSL supports them (apparently they will be with OpenSSL version 1.0.1). Change-Id: I940d020b181b5fa528788ef0c3c47e8ef873796a Reviewed-by: Lars Knoll --- .../network_remote_stresstest/tst_network_remote_stresstest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp') diff --git a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp index 59a8e9ea90..77589d350e 100644 --- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp +++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp @@ -253,7 +253,7 @@ void tst_NetworkRemoteStressTest::blockingSequentialRemoteHosts() QVERIFY2(socket->waitForConnected(10000), "Timeout connecting to " + url.encodedHost()); if (isHttps) { - static_cast(socket.data())->setProtocol(QSsl::TlsV1); + static_cast(socket.data())->setProtocol(QSsl::TlsV1_0); static_cast(socket.data())->startClientEncryption(); static_cast(socket.data())->ignoreSslErrors(); QVERIFY2(static_cast(socket.data())->waitForEncrypted(10000), "Timeout starting TLS with " + url.encodedHost()); @@ -306,7 +306,7 @@ void tst_NetworkRemoteStressTest::sequentialRemoteHosts() socket = QSharedPointer(new QTcpSocket); } if (isHttps) { - static_cast(socket.data())->setProtocol(QSsl::TlsV1); + static_cast(socket.data())->setProtocol(QSsl::TlsV1_0); static_cast(socket.data())->connectToHostEncrypted(url.host(), url.port(443)); static_cast(socket.data())->ignoreSslErrors(); } else { @@ -377,7 +377,7 @@ void tst_NetworkRemoteStressTest::parallelRemoteHosts() else socket = new QTcpSocket; if (isHttps) { - static_cast(socket)->setProtocol(QSsl::TlsV1); + static_cast(socket)->setProtocol(QSsl::TlsV1_0); static_cast(socket)->connectToHostEncrypted(url.host(), url.port(443)); static_cast(socket)->ignoreSslErrors(); } else { -- cgit v1.2.3