From 6684653b682bae0be75ea62bb473b126923952f1 Mon Sep 17 00:00:00 2001 From: Philipp Waehnert Date: Wed, 25 Jul 2018 11:00:15 +0200 Subject: configure: add option to disable automatic OpenSSL config loading Sometimes it may be considered a security risk to load an external OpenSSL configuration automatically inside curl_global_init(). The configuration option --disable-ssl-auto-load-config disables this automatism. The Windows build scripts winbuild/Makefile.vs provide a corresponding option ENABLE_SSL_AUTO_LOAD_CONFIG accepting a boolean value. Setting neither of these options corresponds to the previous behavior loading the external OpenSSL configuration automatically. Fixes #2724 Closes #2791 --- winbuild/MakefileBuild.vc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'winbuild/MakefileBuild.vc') diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 019a414a0..2b4087d58 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -152,6 +152,9 @@ SSL_CFLAGS = /DUSE_OPENSSL /I"$(SSL_INC_DIR)" !IF EXISTS("$(SSL_INC_DIR)\is_boringssl.h") SSL_CFLAGS = $(SSL_CFLAGS) /DHAVE_BORINGSSL !ENDIF +!IF "$(ENABLE_OPENSSL_AUTO_LOAD_CONFIG)"=="false" +SSL_CFLAGS = $(SSL_CFLAGS) /DCURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG +!ENDIF !ENDIF -- cgit v1.2.3