mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFAC(deprecated): set certificates on QSslConfiguration

Browse Source 
Previously the certificates were added to the QSslSocket object directly
but Qt 5.15 added this functionality to the QSslConfiguration object and
deprecated the ones in QSslSocket.
This commit is contained in:
Robert Adam 2020-06-11 10:14:22 +02:00
parent 0fcafd86e7
commit bdb12c6622
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/murmur/Server.cpp
View File

@ -1329,6 +1329,25 @@ 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.
@ -1343,13 +1362,13 @@ void Server::newClient() {
// Add intermediate CAs found in the PEM
// bundle used for this server's certificate.
sock->addCaCertificates(qlIntermediates);
QSslConfiguration cfg = sock->sslConfiguration();
cfg.setCiphers(Meta::mp.qlCiphers);
#if defined(USE_QSSLDIFFIEHELLMANPARAMETERS)
cfg.setDiffieHellmanParameters(qsdhpDHParams);
#endif
sock->setSslConfiguration(cfg);
config.setCiphers(Meta::mp.qlCiphers);
#if defined(USE_QSSLDIFFIEHELLMANPARAMETERS)
config.setDiffieHellmanParameters(qsdhpDHParams);
#endif
sock->setSslConfiguration(config);
if (qqIds.isEmpty()) {
log(QString("Session ID pool (%1) empty, rejecting connection").arg(iMaxUsers));