diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-07-20 16:55:24 +0200 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-07-20 22:08:39 +0200 |
commit | 5e688a72046972b871347ff4d8dd141cdf9f2cef (patch) | |
tree | 6073d774723fc15cac5c61b8392a758a01d62e5a /src/plugins/tls/shared | |
parent | e753eb875cce92592cdb16f8d98f48f9364f5101 (diff) |
Fix lcTlsBackend redefined in several places (plugins, static build)
With -static build lcTlsBackend was duplicated.
Pick-to: 6.2
Change-Id: I20ee0f9c7e2027a7033c9fbae628d0d91672e719
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/plugins/tls/shared')
-rw-r--r-- | src/plugins/tls/shared/qsslsocket_mac_shared.cpp | 10 | ||||
-rw-r--r-- | src/plugins/tls/shared/qx509_generic.cpp | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/plugins/tls/shared/qsslsocket_mac_shared.cpp b/src/plugins/tls/shared/qsslsocket_mac_shared.cpp index b808c9e83b..cdecdee9b2 100644 --- a/src/plugins/tls/shared/qsslsocket_mac_shared.cpp +++ b/src/plugins/tls/shared/qsslsocket_mac_shared.cpp @@ -57,8 +57,6 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcTlsBackend) - #ifdef Q_OS_MACOS namespace { @@ -107,9 +105,8 @@ bool isCaCertificateTrusted(SecCertificateRef cfCert, int domain) } } } - } else { - qCWarning(lcTlsBackend, "Error receiving trust for a CA certificate"); } + return false; } @@ -133,11 +130,8 @@ QList<QSslCertificate> systemCaCertificates() SecCertificateRef cfCert = (SecCertificateRef)CFArrayGetValueAtIndex(cfCerts, i); QCFType<CFDataRef> derData = SecCertificateCopyData(cfCert); if (isCaCertificateTrusted(cfCert, dom)) { - if (derData == nullptr) { - qCWarning(lcTlsBackend, "Error retrieving a CA certificate from the system store"); - } else { + if (derData) systemCerts << QSslCertificate(QByteArray::fromCFData(derData), QSsl::Der); - } } } } diff --git a/src/plugins/tls/shared/qx509_generic.cpp b/src/plugins/tls/shared/qx509_generic.cpp index 9265498c4e..f5fd1b6b30 100644 --- a/src/plugins/tls/shared/qx509_generic.cpp +++ b/src/plugins/tls/shared/qx509_generic.cpp @@ -79,8 +79,6 @@ bool X509CertificateGeneric::isSelfSigned() const if (null) return false; - qCWarning(lcTlsBackend, "QSslCertificate::isSelfSigned: This function does not check, whether the certificate " - "is actually signed. It just checks whether issuer and subject are identical"); return subjectMatchesIssuer; } |