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

diff --git a/Makefile.org b/Makefile.org
index 65ee439bff51ff086fd6028682515c8649a56d74..a381960801524f34f8d6815ae480e700eea1a931 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -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; \
                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
 
                $(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; \
        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/openssl version -a
 
 report:

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 4f9ae326be0bb59926333950a9c3a054d2eb7878..e7bb8d764905897e087cc00c34b01e95d173b739 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -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; \
                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
                $(PERL) tools/c_rehash certs)
 
 progs.h: progs.pl

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 1dc1edf99797ceaf5b73b598229d471f8e006f97..09110f3caad4cbbe75fbf19cd2d93072f46e703a 100644 (file)
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -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"; \
                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; \
                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 \
 
 alltests: \
        test_des test_idea test_sha test_md4 test_md5 test_hmac \