Skip to content
Permalink
Browse files

Merge PR #3080: murmur/Cert: check for 'Murmur Autogenerated Certific…

…ate' prefix instead of explicit version in self-signed cert check.
  • Loading branch information...
mkrautz committed May 11, 2017
2 parents 50c94b0 + 3160fc9 commit 6aba9842fb603966a022b53fc8e6a54c4e30100a
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/murmur/Cert.cpp
@@ -387,7 +387,7 @@ void Server::initializeCert() {
// all the same addresses as the Meta server is, use it's cert instead.
// This allows a self-signed certificate generated by Murmur to be
// replaced by a CA-signed certificate in the .ini file.
if (!qscCert.isNull() && issuer == QString::fromUtf8("Murmur Autogenerated Certificate v2") && ! Meta::mp.qscCert.isNull() && ! Meta::mp.qskKey.isNull() && (Meta::mp.qlBind == qlBind)) {
if (!qscCert.isNull() && issuer.startsWith(QString::fromUtf8("Murmur Autogenerated Certificate")) && ! Meta::mp.qscCert.isNull() && ! Meta::mp.qskKey.isNull() && (Meta::mp.qlBind == qlBind)) {
qscCert = Meta::mp.qscCert;
qskKey = Meta::mp.qskKey;
qlIntermediates = Meta::mp.qlIntermediates;

0 comments on commit 6aba984

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