diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-04-09 14:56:13 +0000 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-04-10 13:17:02 +0000 |
| commit | fdc28956c91f385ed1d049a62f99d0b714fd9eff (patch) | |
| tree | f37862e62ff2c8ca74c7a7afe74199e3843dae1e /tests/auto/network/ssl | |
| parent | 2268b6bcdd1b4ddcd78753b81c477f0aa2855261 (diff) | |
Revert "tst_QSslSocket::signatureAlgorithm - fix for OpenSSL 1.1"
This reverts commit e2694fa602e95a9043561e7dfb9f5956c08a5f14.
I'm reverting this patch - I'll fix QSslSocket instead to respect
the requested protocol version.
Change-Id: Ia4bb09a8801c58bc76837518934ac7a3eedd3c07
Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/network/ssl')
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 11fe79a70c..1332b369e7 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -3974,12 +3974,7 @@ void tst_QSslSocket::signatureAlgorithm_data() << QSsl::AnyProtocol << QAbstractSocket::ConnectedState; -#if !QT_CONFIG(opensslv11) - // Signature algorithms do not match, but are ignored because the tls version - // is not v1.2. Note, with OpenSSL 1.1 backend we use generic TLS_client_method - // and TLS_server_method, so both client and server sockets will enable - // protocol version 1.2 and thus handshake will fail (no shared signature - // algorithms). + // signature algorithms do not match, but are ignored because the tls version is not v1.2 QTest::newRow("client_ignore_TlsV1_1") << QByteArrayList({rsaSha256}) << QSsl::TlsV1_1 @@ -4004,7 +3999,6 @@ void tst_QSslSocket::signatureAlgorithm_data() << QByteArrayList({rsaSha512}) << QSsl::TlsV1_0 << QAbstractSocket::ConnectedState; -#endif // opensslv11 } void tst_QSslSocket::signatureAlgorithm() |