Commit 7022a1f7 authored by Mårten Nordheim's avatar Mårten Nordheim
Browse files

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: default avatarTimur Pocheptsov <timur.pocheptsov@qt.io>
Showing with 5 additions and 0 deletions
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#ifndef QT_NO_SSL #ifndef QT_NO_SSL
#include <QtNetwork/qsslcipher.h> #include <QtNetwork/qsslcipher.h>
#include <QtNetwork/qsslkey.h> #include <QtNetwork/qsslkey.h>
#include <QtNetwork/qsslsocket.h>
#endif #endif
#include <QtWebSockets/QWebSocketServer> #include <QtWebSockets/QWebSocketServer>
#include <QtWebSockets/QWebSocket> #include <QtWebSockets/QWebSocket>
...@@ -402,6 +403,8 @@ void tst_QWebSocketServer::tst_preSharedKey() ...@@ -402,6 +403,8 @@ void tst_QWebSocketServer::tst_preSharedKey()
list << cipher; list << cipher;
QSslConfiguration config = QSslConfiguration::defaultConfiguration(); 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.setCiphers(list);
config.setPeerVerifyMode(QSslSocket::VerifyNone); config.setPeerVerifyMode(QSslSocket::VerifyNone);
config.setPreSharedKeyIdentityHint(PSK_SERVER_IDENTITY_HINT); config.setPreSharedKeyIdentityHint(PSK_SERVER_IDENTITY_HINT);
...@@ -422,6 +425,8 @@ void tst_QWebSocketServer::tst_preSharedKey() ...@@ -422,6 +425,8 @@ void tst_QWebSocketServer::tst_preSharedKey()
QWebSocket socket; QWebSocket socket;
QSslConfiguration socketConfig = QSslConfiguration::defaultConfiguration(); 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.setPeerVerifyMode(QSslSocket::VerifyNone);
socketConfig.setCiphers(list); socketConfig.setCiphers(list);
socket.setSslConfiguration(socketConfig); socket.setSslConfiguration(socketConfig);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment