diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2017-02-26 01:11:00 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2017-02-26 01:11:00 +0300 |
| commit | 45276e8f7aa176eca70b969fcb09ff19ef9cb071 (patch) | |
| tree | cbc73301139f9153bc2c5b0bf51fa49e62f56856 /src/murmur/Cert.cpp | |
| parent | 7b500db3611184623c7b684251c8e64c8310c227 (diff) | |
Cert: for servers using the cert/key specified in murmur.ini, also inherit its intermediates.
Diffstat (limited to 'src/murmur/Cert.cpp')
| -rw-r--r-- | src/murmur/Cert.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp index 1be63a934..1e4706ea7 100644 --- a/src/murmur/Cert.cpp +++ b/src/murmur/Cert.cpp @@ -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()) { |