murmur/0001-Fix-ssl.patch

41 lines
1.5 KiB
Diff
Raw Normal View History

diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index 22a150b6..fa77d96f 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -1373,25 +1373,6 @@ void Server::newClient() {
sock->setPrivateKey(qskKey);
sock->setLocalCertificate(qscCert);
- QSslConfiguration config = sock->sslConfiguration();
-#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
- // Qt 5.15 introduced QSslConfiguration::addCaCertificate(s) that should be preferred over the functions in QSslSocket
-
- // Treat the leaf certificate as a root.
- // This shouldn't strictly be necessary,
- // and is a left-over from early on.
- // Perhaps it is necessary for self-signed
- // certs?
- config.addCaCertificate(qscCert);
-
- // Add CA certificates specified via
- // murmur.ini's sslCA option.
- config.addCaCertificates(Meta::mp.qlCA);
-
- // Add intermediate CAs found in the PEM
- // bundle used for this server's certificate.
- config.addCaCertificates(qlIntermediates);
-#else
// Treat the leaf certificate as a root.
// This shouldn't strictly be necessary,
// and is a left-over from early on.
@@ -1406,8 +1387,8 @@ void Server::newClient() {
// Add intermediate CAs found in the PEM
// bundle used for this server's certificate.
sock->addCaCertificates(qlIntermediates);
-#endif
+ QSslConfiguration config = sock->sslConfiguration();
config.setCiphers(Meta::mp.qlCiphers);
#if defined(USE_QSSLDIFFIEHELLMANPARAMETERS)
config.setDiffieHellmanParameters(qsdhpDHParams);