Browse Source

[Qt] paymentserver: do not log NULL certificates

- also add a few more comments in PaymentServer::LoadRootCAs
0.13
Philip Kaufmann 10 years ago
parent
commit
5a53d7cda3
  1. 11
      src/qt/paymentserver.cpp

11
src/qt/paymentserver.cpp

@ -143,13 +143,20 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store)
int nRootCerts = 0; int nRootCerts = 0;
const QDateTime currentTime = QDateTime::currentDateTime(); 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()) { if (currentTime < cert.effectiveDate() || currentTime > cert.expiryDate()) {
ReportInvalidCertificate(cert); ReportInvalidCertificate(cert);
continue; continue;
} }
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
// Blacklisted certificate
if (cert.isBlacklisted()) { if (cert.isBlacklisted()) {
ReportInvalidCertificate(cert); ReportInvalidCertificate(cert);
continue; continue;

Loading…
Cancel
Save