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-21 12:20:06 +0200 |
| commit | 4c5b604fabc0a7992ae5b1ab7beaa294f0e33388 (patch) | |
| tree | a1a26179c1b27c1bc95f9761d7f2c8102e3caad6 /src/plugins/tls/shared/qsslsocket_mac_shared.cpp | |
| parent | 18458dbebdd8bddd3242dc72a2bf7b74d6700b3c (diff) | |
Fix lcTlsBackend redefined in several places (plugins, static build)
With -static build lcTlsBackend was duplicated.
Change-Id: I20ee0f9c7e2027a7033c9fbae628d0d91672e719
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 5e688a72046972b871347ff4d8dd141cdf9f2cef)
Diffstat (limited to 'src/plugins/tls/shared/qsslsocket_mac_shared.cpp')
| -rw-r--r-- | src/plugins/tls/shared/qsslsocket_mac_shared.cpp | 10 |
1 files changed, 2 insertions, 8 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); - } } } } |