Merge pull request #5666

0c03a93 [Qt] add debug logging for -rootcertificates option (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2015-01-16 10:53:02 +01:00
commit c29568a686
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 10 additions and 7 deletions

View File

@ -124,19 +124,22 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store)
// and get 'I don't like X.509 certificates, don't trust anybody' behavior: // and get 'I don't like X.509 certificates, don't trust anybody' behavior:
QString certFile = QString::fromStdString(GetArg("-rootcertificates", "-system-")); QString certFile = QString::fromStdString(GetArg("-rootcertificates", "-system-"));
if (certFile.isEmpty()) // Empty store
return; // Empty store if (certFile.isEmpty()) {
qDebug() << QString("PaymentServer::%1: Payment request authentication via X.509 certificates disabled.").arg(__func__);
return;
}
QList<QSslCertificate> certList; QList<QSslCertificate> certList;
if (certFile != "-system-") if (certFile != "-system-") {
{ qDebug() << QString("PaymentServer::%1: Using \"%2\" as trusted root certificate.").arg(__func__).arg(certFile);
certList = QSslCertificate::fromPath(certFile); certList = QSslCertificate::fromPath(certFile);
// Use those certificates when fetching payment requests, too: // Use those certificates when fetching payment requests, too:
QSslSocket::setDefaultCaCertificates(certList); QSslSocket::setDefaultCaCertificates(certList);
} } else
else certList = QSslSocket::systemCaCertificates();
certList = QSslSocket::systemCaCertificates ();
int nRootCerts = 0; int nRootCerts = 0;
const QDateTime currentTime = QDateTime::currentDateTime(); const QDateTime currentTime = QDateTime::currentDateTime();