summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2018-11-02 16:04:50 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2018-11-05 09:18:13 +0000
commit7022a1f7e8f703815022bc7d0956da54f9f7a3c1 (patch)
tree3b0601c4aa521db4f021de7ed705f2ab8ed294e9
parentf54a5c825482ca00e1c9e09f3738763f86b157f2 (diff)
downloadqtwebsockets-7022a1f7e8f703815022bc7d0956da54f9f7a3c1.tar.gz
tst_qwebsocketserver: force TLS 1.2 for the PSK test
When using TLS 1.3 the psk callback is called on the start of a connection. Force TLS 1.2 to avoid this. Task-number: QTBUG-71560 Change-Id: I97df3a9d2f100d10b4a1d2e8d0e4696688ec66ac Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-rw-r--r--tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
index 2f17619..64b2489 100644
--- a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
+++ b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
@@ -35,6 +35,7 @@
#ifndef QT_NO_SSL
#include <QtNetwork/qsslcipher.h>
#include <QtNetwork/qsslkey.h>
+#include <QtNetwork/qsslsocket.h>
#endif
#include <QtWebSockets/QWebSocketServer>
#include <QtWebSockets/QWebSocket>
@@ -402,6 +403,8 @@ void tst_QWebSocketServer::tst_preSharedKey()
list << cipher;
QSslConfiguration config = QSslConfiguration::defaultConfiguration();
+ if (QSslSocket::sslLibraryVersionNumber() >= 0x10101000L)
+ config.setProtocol(QSsl::TlsV1_2); // With TLS 1.3 there are some issues with PSK, force 1.2
config.setCiphers(list);
config.setPeerVerifyMode(QSslSocket::VerifyNone);
config.setPreSharedKeyIdentityHint(PSK_SERVER_IDENTITY_HINT);
@@ -422,6 +425,8 @@ void tst_QWebSocketServer::tst_preSharedKey()
QWebSocket socket;
QSslConfiguration socketConfig = QSslConfiguration::defaultConfiguration();
+ if (QSslSocket::sslLibraryVersionNumber() >= 0x10101000L)
+ socketConfig.setProtocol(QSsl::TlsV1_2); // With TLS 1.3 there are some issues with PSK, force 1.2
socketConfig.setPeerVerifyMode(QSslSocket::VerifyNone);
socketConfig.setCiphers(list);
socket.setSslConfiguration(socketConfig);