summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-12-03 13:56:52 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-12-03 13:56:52 +0100
commit4da4d44ddc2cadcb372e3ba45cbd08a8138ef5a2 (patch)
tree7e6b2ce69908c56a45e2645cad4a0f535b174207
parent23d6c2066f91dd20b5c82546875bd0896ab913b0 (diff)
downloadcurl-bagder/openssl-load-config.tar.gz
fixup ifdef the OPENSSL_INIT_ENGINE_ALL_BUILTINbagder/openssl-load-config
-rw-r--r--lib/vtls/openssl.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 28c34aa64..08fd98637 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -1117,13 +1117,17 @@ static int Curl_ossl_init(void)
{
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
!defined(LIBRESSL_VERSION_NUMBER)
- const int64_t flags = OPENSSL_INIT_ENGINE_ALL_BUILTIN |
+ const int64_t flags =
+#ifdef OPENSSL_INIT_ENGINE_ALL_BUILTIN
+ /* not present in BoringSSL */
+ OPENSSL_INIT_ENGINE_ALL_BUILTIN |
+#endif
#ifdef CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG
- OPENSSL_INIT_NO_LOAD_CONFIG
+ OPENSSL_INIT_NO_LOAD_CONFIG |
#else
- OPENSSL_INIT_LOAD_CONFIG
+ OPENSSL_INIT_LOAD_CONFIG |
#endif
- ;
+ 0;
OPENSSL_init_ssl(flags, NULL);
#else
OPENSSL_load_builtin_modules();