diff options
author | Martin Petersson <Martin.Petersson@nokia.com> | 2012-02-21 15:28:18 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-23 16:38:45 +0100 |
commit | 19a562a92318f417bb4dca0cae2b97f28a98a7e2 (patch) | |
tree | 3a48475c439d6191cfe989042d62e4d2aae6aa36 | |
parent | 031389e62eef062d0bc93539d9144265996fa86f (diff) |
QSslSocket::verify certificates when on-demand loading is used
Task-number: QTBUG-24350
Change-Id: I5a328efe6606f5d438bb4787a5c02a425ce42aca
Reviewed-by: Richard J. Moore <rich@kde.org>
-rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index f62f3c1229..20ad82407c 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -1384,6 +1384,10 @@ QList<QSslError> QSslSocketBackendPrivate::verify(QList<QSslCertificate> certifi return errors; } + if (s_loadRootCertsOnDemand) { + setDefaultCaCertificates(defaultCaCertificates() + systemCaCertificates()); + } + QList<QSslCertificate> expiredCerts; foreach (const QSslCertificate &caCertificate, QSslSocket::defaultCaCertificates()) { |