From 5d94b679de6a89f8a868ac3588ad12af24fcf0e0 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 25 Nov 2015 14:55:29 +0100 Subject: [PATCH] qsslsocket_shared_mac - fix a warning and compilation errors SecTrustSettingsDomain is now (in the latest SDK) an enum, not a typedef for integer type. Change-Id: I1ad891190116cb27e10e38167fc15b4ee16a28f4 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/network/ssl/qsslsocket_mac_shared.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/network/ssl/qsslsocket_mac_shared.cpp b/src/network/ssl/qsslsocket_mac_shared.cpp index b9ffd51da89..f44b20e9381 100644 --- a/src/network/ssl/qsslsocket_mac_shared.cpp +++ b/src/network/ssl/qsslsocket_mac_shared.cpp @@ -91,7 +91,7 @@ bool hasTrustedSslServerPolicy(SecPolicyRef policy, CFDictionaryRef props) { bool isCaCertificateTrusted(SecCertificateRef cfCert, int domain) { QCFType cfTrustSettings; - OSStatus status = SecTrustSettingsCopyTrustSettings(cfCert, domain, &cfTrustSettings); + OSStatus status = SecTrustSettingsCopyTrustSettings(cfCert, SecTrustSettingsDomain(domain), &cfTrustSettings); if (status == noErr) { CFIndex size = CFArrayGetCount(cfTrustSettings); // if empty, trust for everything (as per the Security Framework documentation) @@ -125,8 +125,8 @@ QList QSslSocketPrivate::systemCaCertificates() QCFType cfCerts; // iterate through all enum members, order: // kSecTrustSettingsDomainUser, kSecTrustSettingsDomainAdmin, kSecTrustSettingsDomainSystem - for (int dom = kSecTrustSettingsDomainUser; dom <= kSecTrustSettingsDomainSystem; dom++) { - OSStatus status = SecTrustSettingsCopyCertificates(dom, &cfCerts); + for (int dom = kSecTrustSettingsDomainUser; dom <= int(kSecTrustSettingsDomainSystem); dom++) { + OSStatus status = SecTrustSettingsCopyCertificates(SecTrustSettingsDomain(dom), &cfCerts); if (status == noErr) { const CFIndex size = CFArrayGetCount(cfCerts); for (CFIndex i = 0; i < size; ++i) {