Skip to content

Commit 2468471

Browse files
committed
Merge #14403: qt: Revert "Force TLS1.0+ for SSL connections"
7d173c4 qt: Revert "Force TLS1.0+ for SSL connections" (Tim Ruffing) Pull request description: This reverts commit 15e26a6, whose purpose was to tweak the Qt configuration to force TLS, i.e., to disable SSLv3, in Qt versions >= 5.5. However, the default behavior of Qt >= 5.4 is to disable SSLv3 anyway [1], so the configuration tweak is redundant. With Qt 5.11.2, the configuration tweak is not only redundant but in fact provokes a deadlock due to a bug in Qt 5.11.2. Since the deadlock occurs at the early startup stage of bitcoin-qt, it renders bitcoin-qt entirely non-functional when compiled against Qt 5.11.2 (and maybe other Qt versions). Fixes #14359. [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=3fd2d9eff8c1f948306ee5fbfe364ccded1c4b84 Tree-SHA512: 9dd86557b8d265dfa56592924778a736590f2e6a0b2acf77d4f9f4200206a9edaa79b144b0085ea59ac0cc1bc66d9740402fd02f9298ff74c8d6f526f3f725d6
2 parents 9bd3ff4 + 7d173c4 commit 2468471

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/qt/bitcoin.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#include <QThread>
5252
#include <QTimer>
5353
#include <QTranslator>
54-
#include <QSslConfiguration>
5554

5655
#if defined(QT_STATICPLUGIN)
5756
#include <QtPlugin>
@@ -577,13 +576,6 @@ int main(int argc, char *argv[])
577576
#ifdef Q_OS_MAC
578577
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
579578
#endif
580-
#if QT_VERSION >= 0x050500
581-
// Because of the POODLE attack it is recommended to disable SSLv3 (https://disablessl3.com/),
582-
// so set SSL protocols to TLS1.0+.
583-
QSslConfiguration sslconf = QSslConfiguration::defaultConfiguration();
584-
sslconf.setProtocol(QSsl::TlsV1_0OrLater);
585-
QSslConfiguration::setDefaultConfiguration(sslconf);
586-
#endif
587579

588580
// Register meta types used for QMetaObject::invokeMethod
589581
qRegisterMetaType< bool* >();

0 commit comments

Comments
 (0)