0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1202 rebuild SSL certs on start on OSX - part 2

Browse Source
This commit is contained in:
Petr Mrázek
2015-09-29 01:06:26 +02:00
parent 22c0d5cf46
commit b7ff8a4c1c
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
application/CertWorkaround.cpp
View File

@@ -20,7 +20,8 @@
* \return A list of new QSslCertificates generated from the
* KeyChain DER data.
*/
static QList<QSslCertificate> LoadCertificatesFromKeyChain(const std::string &keyChainPath = std::string())
static QList<QSslCertificate>
LoadCertificatesFromKeyChain(const std::string &keyChainPath = std::string())
{
QList<QSslCertificate> qtCerts;
@@ -71,10 +72,10 @@ static QList<QSslCertificate> 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()
qDebug() << "COMMON NAME: "
<< qtCert.issuerInfo(QSslCertificate::CommonName).join('\n')
<< " ORG NAME: "
<< qtCert.issuerInfo(QSslCertificate::Organization).toStdString().c_str()
<< qtCert.issuerInfo(QSslCertificate::Organization).join('\n')
<< std::endl;
qtCerts << qtCert;
@@ -107,11 +108,11 @@ 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()
qDebug() << "cert not known to Qt - adding";
qDebug() << "COMMON NAME: "
<< qtCert.issuerInfo(QSslCertificate::CommonName).join('\n')
<< " ORG NAME: "
<< qtCert.issuerInfo(QSslCertificate::Organization).toStdString().c_str()
<< qtCert.issuerInfo(QSslCertificate::Organization).join('\n')
<< std::endl;
QSslSocket::addDefaultCaCertificate(qtCert);