CactiChameleon9/PrismLauncher
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
application/CertWorkaround.cpp
View File

@ -20,7 +20,8 @@
* \return A list of new QSslCertificates generated from the * \return A list of new QSslCertificates generated from the
* KeyChain DER data. * 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; QList<QSslCertificate> qtCerts;
@ -71,11 +72,11 @@ static QList<QSslCertificate> LoadCertificatesFromKeyChain(const std::string &ke
// create a Qt certificate from the data and add it to the list // create a Qt certificate from the data and add it to the list
QSslCertificate qtCert(byteArray, QSsl::Der); QSslCertificate qtCert(byteArray, QSsl::Der);
std::cout << "COMMON NAME: " qDebug() << "COMMON NAME: "
<< qtCert.issuerInfo(QSslCertificate::CommonName).toStdString().c_str() << qtCert.issuerInfo(QSslCertificate::CommonName).join('\n')
<< " ORG NAME: " << " ORG NAME: "
<< qtCert.issuerInfo(QSslCertificate::Organization).toStdString().c_str() << qtCert.issuerInfo(QSslCertificate::Organization).join('\n')
<< std::endl; << std::endl;
qtCerts << qtCert; qtCerts << qtCert;
} }
@ -107,12 +108,12 @@ void RebuildQtCertificates()
{ {
if (!existingCerts.contains(qtCert)) if (!existingCerts.contains(qtCert))
{ {
std::cout << "cert not known to Qt - adding" << std::endl; qDebug() << "cert not known to Qt - adding";
std::cout << "COMMON NAME: " qDebug() << "COMMON NAME: "
<< qtCert.issuerInfo(QSslCertificate::CommonName).toStdString().c_str() << qtCert.issuerInfo(QSslCertificate::CommonName).join('\n')
<< " ORG NAME: " << " ORG NAME: "
<< qtCert.issuerInfo(QSslCertificate::Organization).toStdString().c_str() << qtCert.issuerInfo(QSslCertificate::Organization).join('\n')
<< std::endl; << std::endl;
QSslSocket::addDefaultCaCertificate(qtCert); QSslSocket::addDefaultCaCertificate(qtCert);
} }