Merge from main trunk, all conflicts resolved. (5209202f) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+25 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,31 @@
		OpenSSL CHANGES
		_______________

		Changes between 0.9.6 and 0.9.7 [xx XXX 2000]

		*) Fix for bug in DirectoryString mask setting. Add support for
		X509_NAME_print_ex() in 'req' and X509_print_ex() function
		to allow certificate printing to more controllable, additional
		'certopt' option to 'x509' to allow new printing options to be
		set.
		[Steve Henson]

		*) Clean old EAY MD5 hack from e_os.h.
		[Richard Levitte]

		*) Fix SSL_CTX_set_read_ahead macro to actually use its argument.

		Copy SSL_CTX's read_ahead flag to SSL object directly in SSL_new
		and not in SSL_clear because the latter is also used by the
		accept/connect functions; previously, the settings made by
		SSL_set_read_ahead would be lost during the handshake.
		[Bodo Moeller; problems reported by Anders Gertz <gertz@epact.se>]

		*) Correct util/mkdef.pl to be selective about disabled algorithms.
		Previously, it would create entries for disableed algorithms no
		matter what.
		[Richard Levitte]

		Changes between 0.9.5a and 0.9.6 [24 Sep 2000]

		*) In ssl23_get_client_hello, generate an error message when faced

+6 −2

Original line number	Diff line number	Diff line
		@@ -289,8 +289,8 @@ my %table=(
		#
		# <appro@fy.chalmers.se>
		#
		"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:asm/alpha.o::",
		"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/alpha.o::",
		"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:asm/alpha.o:dlfcn:linux-shared:-fPIC",
		"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/alpha.o:dlfcn:linux-shared:-fPIC",
		"linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:asm/alpha.o::",
		"linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:asm/alpha.o::",

		@@ -740,6 +740,10 @@ if ($shared_cflag ne "")
		$shared_mark2 = ".shlib.";
		}
		}
		else
		{
		$no_shared = 1;
		}

		#my ($bn1)=split(/\s+/,$bn_obj);
		#$bn1 = "" unless defined $bn1;

+4 −3

Original line number	Diff line number	Diff line
		@@ -462,7 +462,8 @@ install: all install_docs
		if [ -f "$$i" ]; then \
		( echo installing $$i; \
		cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
		$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
		(echo $$i \| grep '\\.a$$' > /dev/null 2>&1) \
		&& $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
		chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
		fi \
		done
		@@ -473,19 +474,19 @@ install_docs:
		$(INSTALL_PREFIX)$(MANDIR)/man3 \
		$(INSTALL_PREFIX)$(MANDIR)/man5 \
		$(INSTALL_PREFIX)$(MANDIR)/man7
		@echo installing man 1 and man 5
		@for i in doc/apps/*.pod; do \
		fn=`basename $$i .pod`; \
		sec=`[ "$$fn" = "config" ] && echo 5 \|\| echo 1`; \
		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
		(cd `dirname $$i`; \
		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
		--release=$(VERSION) `basename $$i`) \
		> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
		done
		@echo installing man 3 and man 7
		@for i in doc/crypto/.pod doc/ssl/.pod; do \
		fn=`basename $$i .pod`; \
		sec=`[ "$$fn" = "des_modes" ] && echo 7 \|\| echo 3`; \
		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
		(cd `dirname $$i`; \
		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
		--release=$(VERSION) `basename $$i`) \

+1 −1

Original line number	Diff line number	Diff line

		OpenSSL 0.9.6 [engine] 24 Sep 2000
		OpenSSL 0.9.7-dev [engine] 24 Sep 2000

		Copyright (c) 1998-2000 The OpenSSL Project
		Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

+2 −1

Original line number	Diff line number	Diff line

		OpenSSL STATUS Last modified at
		______________ $Date: 2000/09/24 16:04:33 $
		______________ $Date: 2000/10/10 08:39:58 $

		DEVELOPMENT STATE

		o OpenSSL 0.9.7: Under development...
		o OpenSSL 0.9.6: Released on September 24th, 2000
		o OpenSSL 0.9.5a: Released on April 1st, 2000
		o OpenSSL 0.9.5: Released on February 28th, 2000