From 4da4d44ddc2cadcb372e3ba45cbd08a8138ef5a2 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 3 Dec 2020 13:56:52 +0100 Subject: fixup ifdef the OPENSSL_INIT_ENGINE_ALL_BUILTIN --- lib/vtls/openssl.c | 12 ++++++++---- 1 file 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(); -- cgit v1.2.1