diff options
| author | Philip Kaufmann <[email protected]> | 2014-12-12 10:15:34 +0100 |
|---|---|---|
| committer | Philip Kaufmann <[email protected]> | 2015-04-15 14:31:48 +0200 |
| commit | 5a53d7cda37677f393cddcc483523eb2cbfaf88d (patch) | |
| tree | 6bacb0735ac849ebeca2f6a6047d716fb3976938 /src/qt/paymentserver.cpp | |
| parent | Merge pull request #5997 (diff) | |
| download | discoin-5a53d7cda37677f393cddcc483523eb2cbfaf88d.tar.xz discoin-5a53d7cda37677f393cddcc483523eb2cbfaf88d.zip | |
[Qt] paymentserver: do not log NULL certificates
- also add a few more comments in PaymentServer::LoadRootCAs
Diffstat (limited to 'src/qt/paymentserver.cpp')
| -rw-r--r-- | src/qt/paymentserver.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index ad489de34..f05bfc059 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -143,13 +143,20 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store) int nRootCerts = 0; const QDateTime currentTime = QDateTime::currentDateTime(); - foreach (const QSslCertificate& cert, certList) - { + + foreach (const QSslCertificate& cert, certList) { + // Don't log NULL certificates + if (cert.isNull()) + continue; + + // Not yet active/valid, or expired certificate if (currentTime < cert.effectiveDate() || currentTime > cert.expiryDate()) { ReportInvalidCertificate(cert); continue; } + #if QT_VERSION >= 0x050000 + // Blacklisted certificate if (cert.isBlacklisted()) { ReportInvalidCertificate(cert); continue; |