diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-07 18:12:02 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-08-07 18:12:02 +0000 |
| commit | ee2e38490d51667e878ed1732df387a6d9f2a5fe (patch) | |
| tree | 4f3b02ab7220326d918b199d60fb33fc497d6dac /src/network/ssl/qsslsocket_mac.cpp | |
| parent | 491e427bb2d3cafccbb26d2ca3b7e128d786a564 (diff) | |
| parent | 053e7cce79d4bef99ec85101b0d22bbb171072c5 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/network/ssl/qsslsocket_mac.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket_mac.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp index bcc65874bd..08ff4a9336 100644 --- a/src/network/ssl/qsslsocket_mac.cpp +++ b/src/network/ssl/qsslsocket_mac.cpp @@ -61,6 +61,7 @@ #include <algorithm> #include <cstddef> +#include <limits> #include <vector> #include <QtCore/private/qcore_mac_p.h> @@ -145,6 +146,16 @@ EphemeralSecKeychain::EphemeralSecKeychain() } } + if (keychain) { + SecKeychainSettings settings = {}; + settings.version = SEC_KEYCHAIN_SETTINGS_VERS1; + // Strange, huh? But that's what their docs say to do! With lockOnSleep + // == false, set interval to INT_MAX to never lock ... + settings.lockInterval = INT_MAX; + if (SecKeychainSetSettings(keychain, &settings) != errSecSuccess) + qCWarning(lcSsl) << "SecKeychainSettings: failed to disable lock on sleep"; + } + #ifdef QSSLSOCKET_DEBUG if (keychain) { qCDebug(lcSsl) << "Custom keychain with name" << keychainName << "was created" |