Commit 8de69cf2 authored by Richard Levitte's avatar Richard Levitte
Browse files

Make sure LD_PRELOAD is only set when we build shared libraries (and 

therefore link with them).  Add LD_PRELOAD setting code where it was
still missing.

PR: 966
parent a2ac429d

Makefile.org

+8 −0
Original line number Diff line number Diff line
@@ -410,6 +410,10 @@ rehash.time: certs 
		LIBPATH="`pwd`:$$LIBPATH"; \

		if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

		if [ -n "$(SHARED_LIBS)" ]; then \

		  LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \

		  export LD_PRELOAD; \

		fi; \

		$(PERL) tools/c_rehash certs)

	touch rehash.time
@@ -424,6 +428,10 @@ tests: rehash 
	LIBPATH="`pwd`:$$LIBPATH"; \

	if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \

	export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

	if [ -n "$(SHARED_LIBS)" ]; then \

	  LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \

	  export LD_PRELOAD; \

	fi; \

	apps/openssl version -a



report:

apps/Makefile.ssl

+4 −0
Original line number Diff line number Diff line
@@ -176,6 +176,10 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) 
		LIBPATH="`pwd`:$$LIBPATH"; \

		if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

		if [ -n "$(SHARED_LIBS)" ]; then \

		  LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \

		  export LD_PRELOAD; \

		fi; \

		$(PERL) tools/c_rehash certs)



progs.h: progs.pl

test/Makefile.ssl

+5 −2
Original line number Diff line number Diff line
@@ -136,9 +136,12 @@ SET_SO_PATHS=OSSL_LIBPATH="`cd ..; pwd`"; \ 
		DYLD_LIBRARY_PATH="$$OSSL_LIBPATH:$$DYLD_LIBRARY_PATH"; \

		SHLIB_PATH="$$OSSL_LIBPATH:$$SHLIB_PATH"; \

		LIBPATH="$$OSSL_LIBPATH:$$LIBPATH"; \

		LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \

		if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="$${LIBPATH}:$$PATH"; fi; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH LD_PRELOAD

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

		if [ -n "$(SHARED_LIBS)" ]; then \

		  LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \

		  export LD_PRELOAD; \

		fi



alltests: \

	test_des test_idea test_sha test_md4 test_md5 test_hmac \