diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-06 09:16:44 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-06 09:16:49 +0100 |
| commit | b0e88b89149f2aaf7c2eb23524655461214130ee (patch) | |
| tree | 4d30b2b8cb933ed122b3c0eb5f37e51d7ad1e207 | |
| parent | 9e87d82e7f0696a40d08c6e4cff3f040a447ece5 (diff) | |
| parent | 0242b5afa4ebb381d3a59a7246348a50d3a7fdbe (diff) | |
| download | bitcoin-b0e88b89149f2aaf7c2eb23524655461214130ee.tar.xz | |
Merge #14666: qt: Revert "Force TLS1.0+ for SSL connections" (0.17)
0242b5afa4ebb381d3a59a7246348a50d3a7fdbe qt: Revert "Force TLS1.0+ for SSL connections" (Tim Ruffing)
Pull request description:
backports #14403 which fixes a crash on FC29
Tree-SHA512: 71a34b13202c834c5ca73bcb9b70efff26c34e1aac3b954f098620b62c2be53a8e319929c4764a5b5cc5d0dd163ff70f4eb3a4f1f608363b7d23d1b16b25ddc7
| -rw-r--r-- | src/qt/bitcoin.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index d3ec67e441..edb6e9bc81 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -50,7 +50,6 @@ #include <QThread> #include <QTimer> #include <QTranslator> -#include <QSslConfiguration> #if defined(QT_STATICPLUGIN) #include <QtPlugin> @@ -576,13 +575,6 @@ int main(int argc, char *argv[]) #ifdef Q_OS_MAC QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); #endif -#if QT_VERSION >= 0x050500 - // Because of the POODLE attack it is recommended to disable SSLv3 (https://disablessl3.com/), - // so set SSL protocols to TLS1.0+. - QSslConfiguration sslconf = QSslConfiguration::defaultConfiguration(); - sslconf.setProtocol(QSsl::TlsV1_0OrLater); - QSslConfiguration::setDefaultConfiguration(sslconf); -#endif // Register meta types used for QMetaObject::invokeMethod qRegisterMetaType< bool* >(); |