From 6a7dc02160acce1b69a3e25d6ed8969829bfd18b Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Mon, 21 May 2012 15:19:50 +0100 Subject: Fix deprecated API warning Check for blacklisting in case the application has blacklisted a cert before windows has (currently unlikely as the blacklist is hardcoded in Qt) Don't need to check for time validity because that's already checked by the windows API. Change-Id: I34da5c4a8a0f8851b9b7668fc421a93c360c8588 Reviewed-by: Richard J. Moore --- src/network/ssl/qsslsocket_openssl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index cb9bc520ef..38368583ff 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -1331,7 +1331,7 @@ void QSslSocketBackendPrivate::fetchCaRootForCert(const QSslCertificate &cert) void QSslSocketBackendPrivate::_q_caRootLoaded(QSslCertificate cert, QSslCertificate trustedRoot) { Q_Q(QSslSocket); - if (trustedRoot.isValid()) { + if (!trustedRoot.isNull() && !trustedRoot.isBlacklisted()) { if (s_loadRootCertsOnDemand) { //Add the new root cert to default cert list for use by future sockets QSslSocket::addDefaultCaCertificate(trustedRoot); -- cgit v1.2.3