From b7ff8a4c1c8ae8381d018705ccf384fb8cc9d619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 29 Sep 2015 01:06:26 +0200 Subject: GH-1202 rebuild SSL certs on start on OSX - part 2 --- application/CertWorkaround.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'application') diff --git a/application/CertWorkaround.cpp b/application/CertWorkaround.cpp index 900343de..fcfa34ea 100644 --- a/application/CertWorkaround.cpp +++ b/application/CertWorkaround.cpp @@ -20,7 +20,8 @@ * \return A list of new QSslCertificates generated from the * KeyChain DER data. */ -static QList LoadCertificatesFromKeyChain(const std::string &keyChainPath = std::string()) +static QList +LoadCertificatesFromKeyChain(const std::string &keyChainPath = std::string()) { QList qtCerts; @@ -71,11 +72,11 @@ static QList LoadCertificatesFromKeyChain(const std::string &ke // create a Qt certificate from the data and add it to the list QSslCertificate qtCert(byteArray, QSsl::Der); - std::cout << "COMMON NAME: " - << qtCert.issuerInfo(QSslCertificate::CommonName).toStdString().c_str() - << " ORG NAME: " - << qtCert.issuerInfo(QSslCertificate::Organization).toStdString().c_str() - << std::endl; + qDebug() << "COMMON NAME: " + << qtCert.issuerInfo(QSslCertificate::CommonName).join('\n') + << " ORG NAME: " + << qtCert.issuerInfo(QSslCertificate::Organization).join('\n') + << std::endl; qtCerts << qtCert; } @@ -107,12 +108,12 @@ void RebuildQtCertificates() { if (!existingCerts.contains(qtCert)) { - std::cout << "cert not known to Qt - adding" << std::endl; - std::cout << "COMMON NAME: " - << qtCert.issuerInfo(QSslCertificate::CommonName).toStdString().c_str() - << " ORG NAME: " - << qtCert.issuerInfo(QSslCertificate::Organization).toStdString().c_str() - << std::endl; + qDebug() << "cert not known to Qt - adding"; + qDebug() << "COMMON NAME: " + << qtCert.issuerInfo(QSslCertificate::CommonName).join('\n') + << " ORG NAME: " + << qtCert.issuerInfo(QSslCertificate::Organization).join('\n') + << std::endl; QSslSocket::addDefaultCaCertificate(qtCert); } -- cgit v1.2.3