From e662eb430d495b050dce9e8cd5055f69495c03b7 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Thu, 1 Aug 2019 04:28:57 +0200 Subject: [PATCH] Server.cpp: replace deprecated QSslSocket::setCiphers() with QSslConfiguration::setCiphers() https://github.com/qt/qtbase/commit/92cda9474245c79b635c21cd140c5d0a3a6d2e5b --- src/murmur/Server.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index 2b256f622..9a3872f98 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -1245,13 +1245,12 @@ void Server::newClient() { // bundle used for this server's certificate. sock->addCaCertificates(qlIntermediates); - sock->setCiphers(Meta::mp.qlCiphers); - -#if defined(USE_QSSLDIFFIEHELLMANPARAMETERS) QSslConfiguration cfg = sock->sslConfiguration(); + cfg.setCiphers(Meta::mp.qlCiphers); +#if defined(USE_QSSLDIFFIEHELLMANPARAMETERS) cfg.setDiffieHellmanParameters(qsdhpDHParams); - sock->setSslConfiguration(cfg); #endif + sock->setSslConfiguration(cfg); if (qqIds.isEmpty()) { log(QString("Session ID pool (%1) empty, rejecting connection").arg(iMaxUsers));