Skip to content
Permalink
Browse files

Meta: fix error message shown when using sslDHParams option with Qt w…

…ithout DH support.

The QSslDiffieHellmanParameters class is only available in Qt 5.8 or
greater. (And in our buildenv's Qt 5.6 as well.)

When using Qt 4, or Qt 5 below 5.8, Murmur should refuse to run if
sslDHParams is set in the .ini.

However, with the introduction of the "@ffdhe2048" default value,
this mechanism broke: since the default value is not empty, users
of a Qt without QSslDiffieHellmanParameters would not be able to run
Murmur unless the explicitly set sslDHParams to the empty string.

This commit fixes the problem by comparing against the value from the
.ini, instead of potentially also checking against the default value.
  • Loading branch information...
mkrautz committed Aug 6, 2017
1 parent 2a84ae6 commit 1ea4b92314b390c6adbfdd28eebd090d7c14f5c5
Showing with 2 additions and 1 deletion.
  1. +2 −1 src/murmur/Meta.cpp
@@ -554,7 +554,8 @@ bool MetaParams::loadSSLSettings() {
}
}
#else
if (! qsSSLDHParams.isEmpty()) {
QString qsSSLDHParamsIniValue = qsSettings->value(QLatin1String("sslDHParams")).toString();
if (! qsSSLDHParamsIniValue.isEmpty()) {
qFatal("MetaParams: This version of Murmur does not support Diffie-Hellman parameters (sslDHParams). Murmur will not start unless you remove the option from your murmur.ini file.");
return false;
}

0 comments on commit 1ea4b92

Please sign in to comment.
You can’t perform that action at this time.