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

Cert: for servers using the cert/key specified in murmur.ini, also inherit its intermediates.

Browse Source
This commit is contained in:
Mikkel Krautz 2017-02-25 23:11:00 +01:00
parent 7b500db361
commit 45276e8f7a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/murmur/Cert.cpp
View File

@ -158,6 +158,7 @@ void Server::initializeCert() {
if (!qscCert.isNull() && issuer == QString::fromUtf8("Murmur Autogenerated Certificate v2") && ! Meta::mp.qscCert.isNull() && ! Meta::mp.qskKey.isNull() && (Meta::mp.qlBind == qlBind)) {
qscCert = Meta::mp.qscCert;
qskKey = Meta::mp.qskKey;
qlIntermediates = Meta::mp.qlIntermediates;
}
// If we still don't have a certificate by now, try to load the one from Meta
@ -167,6 +168,7 @@ void Server::initializeCert() {
}
qskKey = Meta::mp.qskKey;
qscCert = Meta::mp.qscCert;
qlIntermediates = Meta::mp.qlIntermediates;
// If loading from Meta doesn't work, build+sign a new one
if (qscCert.isNull() || qskKey.isNull()) {