From 410148ef1eab050ac97be9a859029307fe678703 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 10 Jul 2017 13:11:43 +0200 Subject: [PATCH] tst_QSslSocket::ephemeralServerKey - fix for OpenSSL 1.1 The original test is quite unfortunate - it has cipher names hardcoded, and it fails with OpenSSL 1.1 - no matching cipher found for 'RC4-SHA' and QSslContext::initSsl fails with 'Invalid or empty cipher list'. We skip this test entry for 1.1. Change-Id: I810b80a62d9e27a60db71fd412af0c80630d976c Reviewed-by: Edward Welbourne --- tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 94377c2f20..74bdcfc5f0 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -3685,7 +3685,9 @@ void tst_QSslSocket::ephemeralServerKey_data() QTest::addColumn("cipher"); QTest::addColumn("emptyKey"); +#if !QT_CONFIG(opensslv11) // 1.1 drops support for RC4-SHA QTest::newRow("NonForwardSecrecyCipher") << "RC4-SHA" << true; +#endif // !opensslv11 QTest::newRow("ForwardSecrecyCipher") << "ECDHE-RSA-AES256-SHA" << (QSslSocket::sslLibraryVersionNumber() < 0x10002000L); }