Commit c2aeb1b3 authored Jun 15, 2017 by Daniel Stenberg

lib/curl_setup.h: remove CURL_WANTS_CA_BUNDLE_ENV

When this define was set, libcurl would check the environment variable
named CURL_CA_BUNDLE at run-time and use that CA cert bundle. This
feature was only defined by the watcom and m32 makefiles and caused
inconsistent behaviours among libcurls built on different platforms.

The curl tool does already feature its own similar logic and the library
does not really need it, and it isn't documented libcurl behavior. So
this change removes it.

Ref: #1538

parent 1c32b6e9

lib/Makefile.Watcom

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ RD = rmdir /q /s 2>NUL
		SYS_INCL = -I"$(%watcom)/h/nt" -I"$(%watcom)/h"

		CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm &
		-wcd=201 -bt=nt -d+ -dWIN32 -dCURL_WANTS_CA_BUNDLE_ENV &
		-wcd=201 -bt=nt -d+ -dWIN32 &
		-dBUILDING_LIBCURL -I. -I"../include" $(SYS_INCL)

		!ifdef %debug

lib/Makefile.m32

+1 −2

Original line number	Diff line number	Diff line
		@@ -250,8 +250,7 @@ ifdef SSL
		endif
		INCLUDES += -I"$(OPENSSL_INCLUDE)"
		CFLAGS += -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \
		-DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 \
		-DCURL_WANTS_CA_BUNDLE_ENV
		-DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5
		DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
		ifdef SRP
		ifeq "$(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h)" "$(OPENSSL_INCLUDE)/openssl/srp.h"

lib/curl_setup.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -640,11 +640,6 @@ int netware_init(void);
		#endif
		#endif

		/* non-configure builds may define CURL_WANTS_CA_BUNDLE_ENV */
		#if defined(CURL_WANTS_CA_BUNDLE_ENV) && !defined(CURL_CA_BUNDLE)
		#define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE")
		#endif

		/*
		* Provide a mechanism to silence picky compilers, such as gcc 4.6+.
		* Parameters should of course normally not be unused, but for example when