|
|
@@ -282,12 +282,14 @@ using socket_t = int;
|
|
|
#include <unordered_set>
|
|
|
#include <utility>
|
|
|
|
|
|
-#if defined(CPPHTTPLIB_USE_NON_BLOCKING_GETADDRINFO) || defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN)
|
|
|
+#if defined(CPPHTTPLIB_USE_NON_BLOCKING_GETADDRINFO) || \
|
|
|
+ defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN)
|
|
|
#if TARGET_OS_OSX
|
|
|
#include <CFNetwork/CFHost.h>
|
|
|
#include <CoreFoundation/CoreFoundation.h>
|
|
|
#endif
|
|
|
-#endif // CPPHTTPLIB_USE_NON_BLOCKING_GETADDRINFO or CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN
|
|
|
+#endif // CPPHTTPLIB_USE_NON_BLOCKING_GETADDRINFO or
|
|
|
+ // CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN
|
|
|
|
|
|
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
|
|
|
#ifdef _WIN32
|
|
|
@@ -6022,7 +6024,8 @@ inline bool load_system_certs_on_windows(X509_STORE *store) {
|
|
|
|
|
|
return result;
|
|
|
}
|
|
|
-#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(TARGET_OS_OSX)
|
|
|
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && \
|
|
|
+ defined(TARGET_OS_OSX)
|
|
|
template <typename T>
|
|
|
using CFObjectPtr =
|
|
|
std::unique_ptr<typename std::remove_pointer<T>::type, void (*)(CFTypeRef)>;
|
|
|
@@ -10217,7 +10220,8 @@ inline bool SSLClient::load_certs() {
|
|
|
#ifdef _WIN32
|
|
|
loaded =
|
|
|
detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_));
|
|
|
-#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(TARGET_OS_OSX)
|
|
|
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && \
|
|
|
+ defined(TARGET_OS_OSX)
|
|
|
loaded = detail::load_system_certs_on_macos(SSL_CTX_get_cert_store(ctx_));
|
|
|
#endif // _WIN32
|
|
|
if (!loaded) { SSL_CTX_set_default_verify_paths(ctx_); }
|
yhirose