diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2015-11-25 14:55:29 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2015-11-25 14:03:06 +0000 |
| commit | 5d94b679de6a89f8a868ac3588ad12af24fcf0e0 (patch) | |
| tree | 844ffefcb411eb19643eccd35bd75eae7d54cf7f /src/network | |
| parent | 299358dcc5e73f03a4de553eca0fed63d3b57a96 (diff) | |
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 <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslsocket_mac_shared.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/ssl/qsslsocket_mac_shared.cpp b/src/network/ssl/qsslsocket_mac_shared.cpp index b9ffd51da8..f44b20e938 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<CFArrayRef> 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<QSslCertificate> QSslSocketPrivate::systemCaCertificates() QCFType<CFArrayRef> 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) { |