forked from pool/libqt5-qtbase
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
|
Index: qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
|
||
|
|
===================================================================
|
||
|
|
--- qtbase-opensource-src-5.5.1.orig/src/network/ssl/qsslsocket_openssl.cpp
|
||
|
|
+++ qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
|
||
|
|
@@ -662,10 +662,13 @@ void QSslSocketPrivate::resetDefaultCiph
|
||
|
|
// Unconditionally exclude ADH and AECDH ciphers since they offer no MITM protection
|
||
|
|
if (!ciph.name().toLower().startsWith(QLatin1String("adh")) &&
|
||
|
|
!ciph.name().toLower().startsWith(QLatin1String("exp-adh")) &&
|
||
|
|
- !ciph.name().toLower().startsWith(QLatin1String("aecdh")))
|
||
|
|
+ !ciph.name().toLower().startsWith(QLatin1String("aecdh"))) {
|
||
|
|
ciphers << ciph;
|
||
|
|
- if (ciph.usedBits() >= 128)
|
||
|
|
- defaultCiphers << ciph;
|
||
|
|
+
|
||
|
|
+ if (ciph.usedBits() >= 128 &&
|
||
|
|
+ !ciph.encryptionMethod().toLower().startsWith(QLatin1String("rc4")))
|
||
|
|
+ defaultCiphers << ciph;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|