Merge in latest changes from 0.9.6-stable. (8fd54b07) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+6 −4

Original line number	Diff line number	Diff line
		@@ -9,10 +9,12 @@
		[Bodo Moeller]

		*) Fix initialization code race conditions in
		SSLv23_client_method(), SSLv23_server_method(),
		SSLv2_client_method(), SSLv2_server_method(),
		SSLv3_client_method(), SSLv3_server_method(),
		TLSv1_client_method(), TLSv1_server_method().
		SSLv23_method(), SSLv23_client_method(), SSLv23_server_method(),
		SSLv2_method(), SSLv2_client_method(), SSLv2_server_method(),
		SSLv3_method(), SSLv3_client_method(), SSLv3_server_method(),
		TLSv1_method(), TLSv1_client_method(), TLSv1_server_method(),
		ssl2_get_cipher_by_char(),
		ssl3_get_cipher_by_char().
		[Patrick McCormick <patrick@tellme.com>, Bodo Moeller]

		*) Reorder cleanup sequence in SSL_CTX_free(): only remove the ex_data after

INSTALL.W32

+2 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,8 @@
		There are various changes you can make to the Win32 compile environment. By
		default the library is not compiled with debugging symbols. If you add 'debug'
		to the mk1mf.pl lines in the do_* batch file then debugging symbols will be
		compiled in.
		compiled in. Note that mk1mf.pl expects the platform to be the last argument
		on the command line, so 'debug' must appear before that, as all other options.

		The default Win32 environment is to leave out any Windows NT specific
		features.

Makefile.org

+13 −9

Original line number	Diff line number	Diff line
		@@ -650,9 +650,10 @@ install: all install_docs
		do \
		if [ -f "$$i" ]; then \
		( echo installing $$i; \
		cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
		$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
		chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
		cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
		$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
		chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
		mv $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
		fi; \
		done
		@if [ -n "$(SHARED_LIBS)" ]; then \
		@@ -662,14 +663,17 @@ install: all install_docs
		if [ -f "$$i" -o -f "$$i.a" ]; then \
		( echo installing $$i; \
		if [ "$(PLATFORM)" != "Cygwin" ]; then \
		cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
		cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
		mv $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
		else \
		c=`echo $$i \| sed 's/^lib/cyg/'`; \
		cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
		chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
		cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \
		chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \
		cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
		chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
		mv $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
		cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
		chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
		mv $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \
		fi ); \
		fi; \
		done; \

apps/Makefile.ssl

+3 −3

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ lint:
		lint -DLINT $(INCLUDES) $(SRC)>fluff

		depend:
		$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(SRC)
		$(MAKEDEPEND) -- $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC)

		dclean:
		$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
		@@ -128,10 +128,10 @@ clean:
		rm -f req

		$(DLIBSSL):
		(cd ../ssl; $(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}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}')
		(cd ..; $(MAKE) DIRS=ssl all)

		$(DLIBCRYPTO):
		(cd ../crypto; $(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}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}')
		(cd ..; $(MAKE) DIRS=crypto all)

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

apps/apps.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -92,8 +92,10 @@ int WIN32_rename(char oldname,char newname);
		#define MAIN(a,v) main(a,v)

		#ifndef NON_MAIN
		LHASH *config=NULL;
		BIO *bio_err=NULL;
		#else
		extern LHASH *config;
		extern BIO *bio_err;
		#endif