Merge #14666: qt: Revert "Force TLS1.0+ for SSL connections" (0.17)
0242b5afa4
qt: Revert "Force TLS1.0+ for SSL connections" (Tim Ruffing)
Pull request description:
backports #14403 which fixes a crash on FC29
Tree-SHA512: 71a34b13202c834c5ca73bcb9b70efff26c34e1aac3b954f098620b62c2be53a8e319929c4764a5b5cc5d0dd163ff70f4eb3a4f1f608363b7d23d1b16b25ddc7
This commit is contained in:
commit
b0e88b8914
1 changed files with 0 additions and 8 deletions
|
@ -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* >();
|
||||
|
|
Loading…
Reference in a new issue