aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-01-16 10:53:02 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-01-16 10:53:31 +0100
commitc29568a68624bc2987637d601879fbbcd5be3b9d (patch)
treee8fc7204bd055b33e671c187f5031532f4198a09
parent9ca6e047907fec88167e1a2b9bc9c40faa824600 (diff)
parent0c03a93e70c9491fde7c4ee283bb4b729212d3b0 (diff)
downloadbitcoin-c29568a68624bc2987637d601879fbbcd5be3b9d.tar.xz
Merge pull request #5666
0c03a93 [Qt] add debug logging for -rootcertificates option (Philip Kaufmann)
-rw-r--r--src/qt/paymentserver.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 8703966606..d642fdae36 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -124,19 +124,22 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store)
// and get 'I don't like X.509 certificates, don't trust anybody' behavior:
QString certFile = QString::fromStdString(GetArg("-rootcertificates", "-system-"));
- if (certFile.isEmpty())
- return; // Empty store
+ // Empty store
+ if (certFile.isEmpty()) {
+ qDebug() << QString("PaymentServer::%1: Payment request authentication via X.509 certificates disabled.").arg(__func__);
+ return;
+ }
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);
// Use those certificates when fetching payment requests, too:
QSslSocket::setDefaultCaCertificates(certList);
- }
- else
- certList = QSslSocket::systemCaCertificates ();
+ } else
+ certList = QSslSocket::systemCaCertificates();
int nRootCerts = 0;
const QDateTime currentTime = QDateTime::currentDateTime();