sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

[auth] fix detection of root CAs on Linux (fixes #13640)

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-11-16 17:15:52 +01:00
parent 5e7291e97e
commit 08ec25bedd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/auth/qgsauthcertutils.h
View File

@ -25,13 +25,13 @@
#include "qgsauthconfig.h"
#if QT_VERSION >= 0x050000
#define SSL_ISSUER_INFO( var, prop ) var.issuerInfo( prop ).first()
#define SSL_ISSUER_INFO( var, prop ) var.issuerInfo( prop ).value(0)
#else
#define SSL_ISSUER_INFO( var, prop ) var.issuerInfo( prop )
#endif
#if QT_VERSION >= 0x050000
#define SSL_SUBJECT_INFO( var, prop ) var.subjectInfo( prop ).first()
#define SSL_SUBJECT_INFO( var, prop ) var.subjectInfo( prop ).value(0)
#else
#define SSL_SUBJECT_INFO( var, prop ) var.subjectInfo( prop )
#endif

7
src/core/auth/qgsauthmanager.cpp
View File

@ -2360,8 +2360,11 @@ bool QgsAuthManager::removeCertAuthority( const QSslCertificate& cert )
const QList<QSslCertificate> QgsAuthManager::getSystemRootCAs()
{
QNetworkRequest req;
return req.sslConfiguration().caCertificates();
#ifndef Q_OS_MAC
return QSslSocket::systemCaCertificates();
#else
return QNetworkRequest::sslConfiguration().caCertificates();
#endif
}
const QList<QSslCertificate> QgsAuthManager::getExtraFileCAs()