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

Recent changes from 0.9.6-stable.

parent b841fc03

Makefile.org

+5 −2
Original line number Original line Diff line number Diff line
@@ -370,7 +370,8 @@ do_svr3-shared: 
		  for obj in `ar t lib$$i.a` ; do \

		  for obj in `ar t lib$$i.a` ; do \

		    OBJS="$${OBJS} `grep $$obj allobjs`" ; \

		    OBJS="$${OBJS} `grep $$obj allobjs`" ; \

		  done ; \

		  done ; \

		  set -x; ${CC}  -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		  set -x; ${CC} ${SHARED_LDFLAGS} \

			-G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \

			$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \

		libs="$$libs -l$$i"; \

		libs="$$libs -l$$i"; \
@@ -384,13 +385,15 @@ do_svr5-shared: 
	else \

	else \

		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

		( PATH=/usr/ccs/bin:$$PATH ; export PATH; \

		( PATH=/usr/ccs/bin:$$PATH ; export PATH; \

		  SHARE_FLAG='-G'; \

		  (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \

		  find . -name "*.o" -print > allobjs ; \

		  find . -name "*.o" -print > allobjs ; \

		  OBJS= ; export OBJS ; \

		  OBJS= ; export OBJS ; \

		  for obj in `ar t lib$$i.a` ; do \

		  for obj in `ar t lib$$i.a` ; do \

		    OBJS="$${OBJS} `grep $$obj allobjs`" ; \

		    OBJS="$${OBJS} `grep $$obj allobjs`" ; \

		  done ; \

		  done ; \

		  set -x; ${CC} ${SHARED_LDFLAGS} \

		  set -x; ${CC} ${SHARED_LDFLAGS} \

			-G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			$${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \

			$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \

		libs="$$libs -l$$i"; \

		libs="$$libs -l$$i"; \

apps/Makefile.ssl

+2 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,7 @@ all: exe 
exe:	$(PROGRAM)

exe:	$(PROGRAM)





req: sreq.o $(A_OBJ) $(DLIBCRYPTO)

req: sreq.o $(A_OBJ) $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o req $(CFLAG) sreq.o $(A_OBJ) $(RAND_OBJ) $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o req $(CFLAG) sreq.o $(A_OBJ) $(RAND_OBJ) $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





sreq.o: req.c 

sreq.o: req.c
@@ -135,6 +136,7 @@ $(DLIBCRYPTO): 




$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)

$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)

	$(RM) $(PROGRAM)

	$(RM) $(PROGRAM)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

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

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

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

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

test/Makefile.ssl

+24 −0
Original line number Original line Diff line number Diff line
@@ -258,78 +258,102 @@ $(DLIBCRYPTO): 
	(cd ..; $(MAKE) DIRS=crypto all)

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





$(RSATEST): $(RSATEST).o $(DLIBCRYPTO)

$(RSATEST): $(RSATEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(RSATEST) $(CFLAGS) $(RSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(RSATEST) $(CFLAGS) $(RSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(BNTEST): $(BNTEST).o $(DLIBCRYPTO)

$(BNTEST): $(BNTEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)

$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(IDEATEST): $(IDEATEST).o $(DLIBCRYPTO)

$(IDEATEST): $(IDEATEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(MD2TEST): $(MD2TEST).o $(DLIBCRYPTO)

$(MD2TEST): $(MD2TEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(SHATEST): $(SHATEST).o $(DLIBCRYPTO)

$(SHATEST): $(SHATEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(SHA1TEST): $(SHA1TEST).o $(DLIBCRYPTO)

$(SHA1TEST): $(SHA1TEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(RMDTEST): $(RMDTEST).o $(DLIBCRYPTO)

$(RMDTEST): $(RMDTEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(MDC2TEST): $(MDC2TEST).o $(DLIBCRYPTO)

$(MDC2TEST): $(MDC2TEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(MD4TEST): $(MD4TEST).o $(DLIBCRYPTO)

$(MD4TEST): $(MD4TEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(MD4TEST) $(CFLAGS) $(MD4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(MD4TEST) $(CFLAGS) $(MD4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(MD5TEST): $(MD5TEST).o $(DLIBCRYPTO)

$(MD5TEST): $(MD5TEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(HMACTEST): $(HMACTEST).o $(DLIBCRYPTO)

$(HMACTEST): $(HMACTEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(RC2TEST): $(RC2TEST).o $(DLIBCRYPTO)

$(RC2TEST): $(RC2TEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(BFTEST): $(BFTEST).o $(DLIBCRYPTO)

$(BFTEST): $(BFTEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(CASTTEST): $(CASTTEST).o $(DLIBCRYPTO)

$(CASTTEST): $(CASTTEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(RC4TEST): $(RC4TEST).o $(DLIBCRYPTO)

$(RC4TEST): $(RC4TEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(RC5TEST): $(RC5TEST).o $(DLIBCRYPTO)

$(RC5TEST): $(RC5TEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(DESTEST): $(DESTEST).o $(DLIBCRYPTO)

$(DESTEST): $(DESTEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(RANDTEST): $(RANDTEST).o $(DLIBCRYPTO)

$(RANDTEST): $(RANDTEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(DHTEST): $(DHTEST).o $(DLIBCRYPTO)

$(DHTEST): $(DHTEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(DSATEST): $(DSATEST).o $(DLIBCRYPTO)

$(DSATEST): $(DSATEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(METHTEST): $(METHTEST).o $(DLIBCRYPTO)

$(METHTEST): $(METHTEST).o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)

$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)





$(ENGINETEST): $(ENGINETEST).o $(DLIBCRYPTO)

$(ENGINETEST): $(ENGINETEST).o $(DLIBCRYPTO)

	$(CC) -o $(ENGINETEST) $(CFLAGS) $(ENGINETEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o $(ENGINETEST) $(CFLAGS) $(ENGINETEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





dummytest: dummytest.o $(DLIBCRYPTO)

dummytest: dummytest.o $(DLIBCRYPTO)

	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	$(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

	$(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)





# DO NOT DELETE THIS LINE -- make depend depends on it.

# DO NOT DELETE THIS LINE -- make depend depends on it.