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

Meta: implement support for named DH parameters for sslDHParams option.

Browse Source
This commit is contained in:
Mikkel Krautz 2017-07-29 13:58:01 +02:00
parent 5db1fa411e
commit 5b3190e680
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/murmur/Meta.cpp
View File

@ -15,6 +15,7 @@
#include "Version.h"
#include "SSL.h"
#include "EnvUtils.h"
#include "FFDHE.h"
#if defined(USE_QSSLDIFFIEHELLMANPARAMETERS)
# include <QSslDiffieHellmanParameters>
@ -519,12 +520,21 @@ bool MetaParams::loadSSLSettings() {
#if defined(USE_QSSLDIFFIEHELLMANPARAMETERS)
if (! qsSSLDHParams.isEmpty()) {
QFile pem(qsSSLDHParams);
if (pem.open(QIODevice::ReadOnly)) {
dhparams = pem.readAll();
pem.close();
if (qsSSLDHParams.startsWith(QLatin1String("@"))) {
QString group = qsSSLDHParams.mid(1).trimmed();
QByteArray pem = FFDHE::PEMForNamedGroup(group);
if (pem.isEmpty()) {
qCritical("MetaParms: Diffie-Hellman parameters with name '%s' is not available in Murmur.", qPrintable(qsSSLDHParams));
}
dhparams = pem;
} else {
qCritical("MetaParams: Failed to read %s", qPrintable(qsSSLDHParams));
QFile pem(qsSSLDHParams);
if (pem.open(QIODevice::ReadOnly)) {
dhparams = pem.readAll();
pem.close();
} else {
qCritical("MetaParams: Failed to read %s", qPrintable(qsSSLDHParams));
}
}
}