Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-11-13 12:06:05 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-11-13 14:44:16 (GMT) |
| commit | 32fef976301f19dba9bdf371777cd5374d327eff (patch) | |
| tree | 009890e4f3c7c7b674a1892590669a2fcc04c838 /Swiften | |
| parent | 71093bfd86608952aba8debc689499cc738e00ca (diff) | |
| download | swift-32fef976301f19dba9bdf371777cd5374d327eff.zip swift-32fef976301f19dba9bdf371777cd5374d327eff.tar.bz2 | |
Fix iOS build and add iOS build documentation.
Test-Information:
Tested on OS X 10.9.5 with XCode 6.1.
Change-Id: Ib223977192fce274e5585ef0768fd755b1fa734d
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/TLS/OpenSSL/OpenSSLContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp index 54fb7bd..991a7dd 100644 --- a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp +++ b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp @@ -69,7 +69,7 @@ OpenSSLContext::OpenSSLContext() : state_(Start), context_(0), handle_(0), readB } #elif !defined(SWIFTEN_PLATFORM_MACOSX) SSL_CTX_load_verify_locations(context_, NULL, "/etc/ssl/certs"); -#elif defined(SWIFTEN_PLATFORM_MACOSX) +#elif defined(SWIFTEN_PLATFORM_MACOSX) && !defined(SWIFTEN_PLATFORM_IPHONE) // On Mac OS X 10.5 (OpenSSL < 0.9.8), OpenSSL does not automatically look in the system store. // On Mac OS X 10.6 (OpenSSL >= 0.9.8), OpenSSL *does* look in the system store to determine trust. // However, if there is a certificate error, it will always emit the "Invalid CA" error if we didn't add |