merge in changes in OpenSSL_0_9_6-stable (conflicts resolved) (1ce60f02) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+4 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,10 @@

		Changes between 0.9.6e and 0.9.6f [XX xxx XXXX]

		*)
		*) Use proper error handling instead of 'assertions' in buffer
		overflow checks added in 0.9.6e. This prevents DoS (the
		assertions could call abort()).
		[Arne Ansper <arne@ats.cyber.ee>, Bodo Moeller]

		Changes between 0.9.6d and 0.9.6e [30 Jul 2002]

		@@ -29,7 +32,6 @@
		applications.
		[Bodo Moeller]


		*) Changes in security patch:

		Changes marked "(CHATS)" were sponsored by the Defense Advanced

Configure

+2 −2

Original line number	Diff line number	Diff line
		@@ -354,8 +354,8 @@ my %table=(
		"linux-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
		"linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"linux-m68k", "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
		"linux-s390", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
		"linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::SIXTY_FOUR_BIT_LONG:::::::::::linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"linux-s390", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR),\$(SHLIB_MINOR)",
		"linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

Makefile.org

+8 −6

Original line number	Diff line number	Diff line
		@@ -247,7 +247,8 @@ link-shared:
		for i in $(SHLIBDIRS); do \
		prev=lib$$i$(SHLIB_EXT); \
		for j in $${tmp:-x}; do \
		( set -x; ln -f -s $$prev lib$$i$$j ); \
		( set -x; \
		rm -f lib$$i$$j; ln -s $$prev lib$$i$$j ); \
		prev=lib$$i$$j; \
		done; \
		done; \
		@@ -676,7 +677,7 @@ install: all install_docs
		done; \
		( here="`pwd`"; \
		cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
		make -f $$here/Makefile link-shared ); \
		$(MAKE) -f $$here/Makefile link-shared ); \
		fi

		install_docs:
		@@ -685,22 +686,23 @@ install_docs:
		$(INSTALL_PREFIX)$(MANDIR)/man3 \
		$(INSTALL_PREFIX)$(MANDIR)/man5 \
		$(INSTALL_PREFIX)$(MANDIR)/man7
		@for i in doc/apps/*.pod; do \
		@pod2man=`cd ../../util; ./pod2mantest ignore`; \
		for i in doc/apps/*.pod; do \
		fn=`basename $$i .pod`; \
		if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
		(cd `$(PERL) util/dirname.pl $$i`; \
		sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \
		sh -c "$(PERL) $$pod2man \
		--section=$$sec --center=OpenSSL \
		--release=$(VERSION) `basename $$i`") \
		> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
		done
		done; \
		@for i in doc/crypto/.pod doc/ssl/.pod; do \
		fn=`basename $$i .pod`; \
		if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
		(cd `$(PERL) util/dirname.pl $$i`; \
		sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \
		sh -c "$(PERL) $$pod2man \
		--section=$$sec --center=OpenSSL \
		--release=$(VERSION) `basename $$i`") \
		> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \

PROBLEMS

+8 −0

Original line number	Diff line number	Diff line
		@@ -32,3 +32,11 @@ may differ on your machine.
		As long as Apple doesn't fix the problem with ld, this problem building
		OpenSSL will remain as is.


		* Parallell make leads to errors

		While running tests, running a parallell make is a bad idea. Many test
		scripts use the same name for output and input files, which means different
		will interfere with each other and lead to test failure.

		The solution is simple for now: don't run parallell make when testing.

STATUS

+1 −1

Original line number	Diff line number	Diff line

		OpenSSL STATUS Last modified at
		______________ $Date: 2002/07/30 10:38:17 $
		______________ $Date: 2002/08/02 11:36:42 $

		DEVELOPMENT STATE