Commit a7b42009 authored by Richard Levitte's avatar Richard Levitte
Browse files

Change the shared library support so the shared libraries get built 

sooner and the programs get built against the shared libraries.

This requires a bit more work.  Things like -rpath and the possibility
to still link the programs statically should be included.  Some
cleanup is also needed.  This will be worked on.
parent 7b5ffd68

CHANGES

+10 −0
Original line number Diff line number Diff line
@@ -12,6 +12,16 @@ 
         *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7

         +) applies to 0.9.7 only



  +) Change the shared library support so shared libraries are built as

     soon as the corresponding static library is finished, and thereby get

     openssl and the test programs linked against the shared library.

     This still only happens when the keyword "shard" has been given to

     the configuration scripts.



     NOTE: shared library support is still an experimental thing, and

     backward binary compatibility is still not guaranteed.

     ["Maciej W. Rozycki" <macro@ds2.pg.gda.pl> and Richard Levitte]



  +) Add support for Subject Information Access extension.

     [Peter Sylvester <Peter.Sylvester@EdelWeb.fr>]

Makefile.org

+10 −9
Original line number Diff line number Diff line
@@ -203,23 +203,18 @@ HEADER= e_os.h 
# When we're prepared to use shared libraries in the programs we link here

# we might remove 'clean-shared' from the targets to perform at this stage



all: clean-shared Makefile.ssl sub_all

all: Makefile.ssl sub_all



sub_all:

	@for i in $(DIRS); \

	do \

	if [ -d "$$i" ]; then \

		(cd $$i && echo "making all in $$i..." && \

		$(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}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' all ) || exit 1; \

		$(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}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' all ) || exit 1; \

	else \

		$(MAKE) $$i; \

	fi; \

	done; \

	if echo "$(DIRS)" | \

	    egrep '(^| )(crypto|ssl)( |$$)' > /dev/null 2>&1 && \

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

		$(MAKE) $(SHARED_LIBS); \

	fi



libcrypto$(SHLIB_EXT): libcrypto.a

	@if [ "$(SHLIB_TARGET)" != "" ]; then \
@@ -510,7 +505,11 @@ dclean: 


rehash: rehash.time

rehash.time: certs

	@(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; export OPENSSL OPENSSL_DEBUG_MEMORY; $(PERL) tools/c_rehash certs)

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

		export OPENSSL OPENSSL_DEBUG_MEMORY; \

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

		export LD_LIBRARY_PATH SHLIB_PATH LIBPATH; \

		$(PERL) tools/c_rehash certs)

	touch rehash.time



test:   tests
@@ -518,7 +517,9 @@ test: tests 
tests: rehash

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

	$(MAKE) CC='${CC}' CFLAG='${CFLAG}' 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}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' OPENSSL_DEBUG_MEMORY=on tests );

	@apps/openssl version -a

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

		export LD_LIBRARY_PATH SHLIB_PATH LIBPATH; \

		apps/openssl version -a



report:

	@$(PERL) util/selftest.pl

apps/Makefile.ssl

+4 −1
Original line number Diff line number Diff line
@@ -140,7 +140,10 @@ $(DLIBCRYPTO): 
$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)

	$(RM) $(PROGRAM)

	$(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBKRB5) $(LIBCRYPTO) $(EX_LIBS)

	-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)

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

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

		export LD_LIBRARY_PATH SHLIB_PATH LIBPATH; \

		$(PERL) tools/c_rehash certs)



progs.h: progs.pl

	$(PERL) progs.pl $(E_EXE) >progs.h

crypto/Makefile.ssl

+7 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ SDIRS= md2 md5 sha mdc2 hmac ripemd \ 
GENERAL=Makefile README crypto-lib.com install.com



LIB= $(TOP)/libcrypto.a

SHARED_LIB= libcrypto$(SHLIB_EXT)

LIBSRC=	cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c

LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o o_time.o
@@ -49,7 +50,7 @@ ALL= $(GENERAL) $(SRC) $(HEADER) 
top:

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



all: buildinf.h lib subdirs

all: buildinf.h lib subdirs shared



buildinf.h: ../Makefile.ssl

	( echo "#ifndef MK1MF_BUILD"; \
@@ -95,6 +96,11 @@ lib: $(LIBOBJ) 
	$(RANLIB) $(LIB) || echo Never mind.

	@touch lib



shared:

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

		(cd ..; make $(SHARED_LIB)); \

	fi



libs:

	@for i in $(SDIRS) ;\

	do \

ssl/Makefile.ssl

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ TEST=ssltest.c 
APPS=



LIB=$(TOP)/libssl.a

SHARED_LIB= libssl$(SHLIB_EXT)

LIBSRC=	\

	s2_meth.c   s2_srvr.c s2_clnt.c  s2_lib.c  s2_enc.c s2_pkt.c \

	s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c s3_pkt.c s3_both.c \
@@ -55,13 +56,18 @@ ALL= $(GENERAL) $(SRC) $(HEADER) 
top:

	(cd ..; $(MAKE) DIRS=$(DIR) all)



all:	lib

all:	lib shared



lib:	$(LIBOBJ)

	$(AR) $(LIB) $(LIBOBJ)

	$(RANLIB) $(LIB) || echo Never mind.

	@touch lib



shared:

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

		(cd ..; make $(SHARED_LIB)); \

	fi



files:

	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO