diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-11-14 12:33:55 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-16 10:32:10 +0100 |
| commit | 4dc390e66fefc850cf84292549285a359e2ad8e6 (patch) | |
| tree | dfc39a2b1e83826ad959a48ec9d7345db1ab3383 /tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp | |
| parent | e2628ef943f5787da92e737ce259db0750154ef7 (diff) | |
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 <lars.knoll@nokia.com>
Diffstat (limited to 'tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp')
| -rw-r--r-- | tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<QSslSocket *>(socket.data())->setProtocol(QSsl::TlsV1); + static_cast<QSslSocket *>(socket.data())->setProtocol(QSsl::TlsV1_0); static_cast<QSslSocket *>(socket.data())->startClientEncryption(); static_cast<QSslSocket *>(socket.data())->ignoreSslErrors(); QVERIFY2(static_cast<QSslSocket *>(socket.data())->waitForEncrypted(10000), "Timeout starting TLS with " + url.encodedHost()); @@ -306,7 +306,7 @@ void tst_NetworkRemoteStressTest::sequentialRemoteHosts() socket = QSharedPointer<QTcpSocket>(new QTcpSocket); } if (isHttps) { - static_cast<QSslSocket *>(socket.data())->setProtocol(QSsl::TlsV1); + static_cast<QSslSocket *>(socket.data())->setProtocol(QSsl::TlsV1_0); static_cast<QSslSocket *>(socket.data())->connectToHostEncrypted(url.host(), url.port(443)); static_cast<QSslSocket *>(socket.data())->ignoreSslErrors(); } else { @@ -377,7 +377,7 @@ void tst_NetworkRemoteStressTest::parallelRemoteHosts() else socket = new QTcpSocket; if (isHttps) { - static_cast<QSslSocket *>(socket)->setProtocol(QSsl::TlsV1); + static_cast<QSslSocket *>(socket)->setProtocol(QSsl::TlsV1_0); static_cast<QSslSocket *>(socket)->connectToHostEncrypted(url.host(), url.port(443)); static_cast<QSslSocket *>(socket)->ignoreSslErrors(); } else { |