summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2011-02-25 11:15:42 (GMT)
committerPeter Hartmann <peter.hartmann@nokia.com>2011-02-28 12:39:49 (GMT)
commit3287348434ee1f15c7468c7d25b2fc97c8791371 (patch)
treeb609578b53075953adbb7f39be23afafba8707ab /tests
parent2053ac707d0d74761ac926bafe3f3fced6daf490 (diff)
downloadQt-3287348434ee1f15c7468c7d25b2fc97c8791371.zip
Qt-3287348434ee1f15c7468c7d25b2fc97c8791371.tar.gz
Qt-3287348434ee1f15c7468c7d25b2fc97c8791371.tar.bz2
SSL: Switch default version to TLS 1.0
TLS is backward compatible, so servers only supporting SSL 3 should still work. All browsers send a TLS 1.0 Client Hello these days. However, some servers apparently have problems with a TLS handshake (and a SNI message); for now, wait and see how many of them are broken and either add a fallback to SSLv3 or blacklist them (i.e. set the used SSL version for those servers explicitly). Reviewed-by: Markus Goetz
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qsslsocket/tst_qsslsocket.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 739f902..4beddad 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -385,7 +385,7 @@ void tst_QSslSocket::constructing()
QVERIFY(!socket.waitForConnected(10));
QTest::ignoreMessage(QtWarningMsg, "QSslSocket::waitForDisconnected() is not allowed in UnconnectedState");
QVERIFY(!socket.waitForDisconnected(10));
- QCOMPARE(socket.protocol(), QSsl::SslV3);
+ QCOMPARE(socket.protocol(), QSsl::TlsV1);
QSslConfiguration savedDefault = QSslConfiguration::defaultConfiguration();
@@ -771,7 +771,7 @@ void tst_QSslSocket::protocol()
#endif
// qDebug() << "socket cert:" << socket->caCertificates().at(0).issuerInfo(QSslCertificate::CommonName);
- QCOMPARE(socket->protocol(), QSsl::SslV3);
+ QCOMPARE(socket->protocol(), QSsl::TlsV1);
{
// Fluke allows SSLv3.
socket->setProtocol(QSsl::SslV3);