Commit 6f17f16f authored by Richard Levitte's avatar Richard Levitte
Browse files

Changes to make shared library building and use work better with Cygwin

parent 84034f7a

CHANGES

+9 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,10 @@ 




 Changes between 0.9.7 and 0.9.8  [xx XXX 2002]

 Changes between 0.9.7 and 0.9.8  [xx XXX 2002]





  *) Make it possible to inhibit symlinking of shared libraries in

     Makefile.shared, for Cygwin's sake.

     [Richard Levitte]



  *) Extend the BIGNUM API by creating new macros that behave like

  *) Extend the BIGNUM API by creating new macros that behave like

     functions

     functions
@@ -315,6 +319,11 @@ TODO: bug: pad x with leading zeros if necessary 
 

 

 Changes between 0.9.6h and 0.9.7  [XX xxx 2002]

 Changes between 0.9.6h and 0.9.7  [XX xxx 2002]





  *) Change the DLL names for Cygwin to cygcrypto-x.y.z.dll and

     cygssl-x.y.z.dll, where x, y and z are the major, minor and

     edit numbers of the version.

     [Corinna Vinschen <vinschen@redhat.com> and Richard Levitte]



  *) Introduce safe string copy and catenation functions

  *) Introduce safe string copy and catenation functions

     (BUF_strlcpy() and BUF_strlcat()).

     (BUF_strlcpy() and BUF_strlcat()).

     [Ben Laurie (CHATS) and Richard Levitte]

     [Ben Laurie (CHATS) and Richard Levitte]

Makefile.org

+4 −2
Original line number Original line Diff line number Diff line
@@ -361,7 +361,8 @@ rehash.time: certs 
	@(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \

	@(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \

		export OPENSSL OPENSSL_DEBUG_MEMORY; \

		export OPENSSL OPENSSL_DEBUG_MEMORY; \

		LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \

		LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH; \

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

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

		$(PERL) tools/c_rehash certs)

		$(PERL) tools/c_rehash certs)

	touch rehash.time

	touch rehash.time
@@ -371,7 +372,8 @@ tests: rehash 
	@(cd test && echo "testing..." && \

	@(cd test && echo "testing..." && \

	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );

	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );

	@LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \

	@LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH; \

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

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

		apps/openssl version -a

		apps/openssl version -a





report:

report:

apps/Makefile.ssl

+2 −1
Original line number Original line Diff line number Diff line
@@ -148,7 +148,8 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) 
	fi

	fi

	-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; \

	-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; \

		LIBPATH="`pwd`"; LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; \

		LIBPATH="`pwd`"; LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH; \

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

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

		$(PERL) tools/c_rehash certs)

		$(PERL) tools/c_rehash certs)





progs.h: progs.pl

progs.h: progs.pl

test/Makefile.ssl

+3 −2
Original line number Original line Diff line number Diff line
@@ -123,8 +123,9 @@ tests: exe apps $(TESTS) 
apps:

apps:

	@(cd ..; $(MAKE) DIRS=apps all)

	@(cd ..; $(MAKE) DIRS=apps all)





SET_SO_PATHS=LIBPATH="`cd ..; pwd`"; LD_LIBRARY_PATH=$$LIBPATH; DYLD_LIBRARY_PATH=$$LIBPATH; SHLIB_PATH=$$LIBPATH; \

SET_SO_PATHS=LIBPATH="`cd ..; pwd`"; LD_LIBRARY_PATH="$$LIBPATH"; DYLD_LIBRARY_PATH="$$LIBPATH"; SHLIB_PATH="$$LIBPATH"; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH

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

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH





alltests: \

alltests: \

	test_des test_idea test_sha test_md4 test_md5 test_hmac \

	test_des test_idea test_sha test_md4 test_md5 test_hmac \