Merge in the latest changes from the 0.9.6-stable branch. (41aad62a) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+30 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,36 @@
		*) Fix a crashbug and a logic bug in hwcrhk_load_pubkey()
		[Toomas Kiisk <vix@cyber.ee> via Richard Levitte]

		*) Add the configuration target linux-s390x.
		[Neale Ferguson <Neale.Ferguson@SoftwareAG-USA.com> via Richard Levitte]

		*) The earlier bugfix for the SSL3_ST_SW_HELLO_REQ_C case of
		ssl3_accept (ssl/s3_srvr.c) incorrectly used a local flag
		variable as an indication that a ClientHello message has been
		received. As the flag value will be lost between multiple
		invocations of ssl3_accept when using non-blocking I/O, the
		function may not be aware that a handshake has actually taken
		place, thus preventing a new session from being added to the
		session cache.

		To avoid this problem, we now set s->new_session to 2 instead of
		using a local variable.
		[Lutz Jaenicke, Bodo Moeller]

		*) Bugfix: Return -1 from ssl3_get_server_done (ssl3/s3_clnt.c)
		if the SSL_R_LENGTH_MISMATCH error is detected.
		[Geoff Thorpe, Bodo Moeller]

		*) New 'shared_ldflag' column in Configure platform table.
		[Richard Levitte]

		*) Fix EVP_CIPHER_mode macro.
		["Dan S. Camper" <dan@bti.net>]

		*) Fix ssl3_read_bytes (ssl/s3_pkt.c): To ignore messages of unknown
		type, we must throw them away by setting rr->length to 0.
		[D P Chang <dpc@qualys.com>]

		Changes between 0.9.6b and 0.9.6c [21 dec 2001]

		*) Fix BN_rand_range bug pointed out by Dominikus Scherkl

Configure

+68 −62

File changed.

Preview size limit exceeded, changes collapsed.

INSTALL.W32

+12 −6

Original line number	Diff line number	Diff line
		@@ -2,11 +2,14 @@
		INSTALLATION ON THE WIN32 PLATFORM
		----------------------------------

		Heres a few comments about building OpenSSL in Windows environments. Most of
		this is tested on Win32 but it may also work in Win 3.1 with some
		Heres a few comments about building OpenSSL in Windows environments. Most
		of this is tested on Win32 but it may also work in Win 3.1 with some
		modification.

		You need Perl for Win32 (available from http://www.activestate.com/ActivePerl)
		You need Perl for Win32. Unless you will build on CygWin32, you will need
		ActiveState Perl, available from http://www.activestate.com/ActivePerl.
		For CygWin32 users, there's more info in the CygWin32 section.

		and one of the following C compilers:

		* Visual C++
		@@ -149,7 +152,9 @@

		* Install CygWin32 (see http://sourceware.cygnus.com/cygwin)

		* Install Perl and ensure it is in the path
		* Install Perl and ensure it is in the path (recent Cygwin perl
		(version 5.6.1-2 of the latter has been reported to work) or
		ActivePerl)

		* Run the CygWin bash shell

		@@ -183,8 +188,9 @@
		Installation
		------------

		There's currently no real installation procedure for Win32. There are,
		however, some suggestions:
		If you used the CygWin procedure above, you have already installed and
		can skip this section. For all other procedures, there's currently no real
		installation procedure for Win32. There are, however, some suggestions:

		- do nothing. The include files are found in the inc32/ subdirectory,
		all binaries are found in out32dll/ or out32/ depending if you built

Makefile.org

+31 −10

Original line number	Diff line number	Diff line
		@@ -183,6 +183,7 @@ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
		SHARED_SSL=libssl$(SHLIB_EXT)
		SHARED_LIBS=
		SHARED_LIBS_LINK_EXTS=
		SHARED_LDFLAGS=

		GENERAL= Makefile
		BASENAME= openssl
		@@ -255,7 +256,8 @@ do_bsd-gcc-shared: do_gnu-shared
		do_linux-shared: do_gnu-shared
		do_gnu-shared:
		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
		( set -x; ${CC} -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
		( set -x; ${CC} ${SHARED_LDFLAGS} \
		-shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
		-Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
		-Wl,--whole-archive lib$$i.a \
		-Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) \|\| exit 1; \
		@@ -269,13 +271,25 @@ DETECT_GNU_LD=${CC} -v 2>&1 \| grep '^gcc' >/dev/null 2>&1 && \
		[ -n "$$my_ld" ] && \
		$$my_ld -v 2>&1 \| grep 'GNU ld' >/dev/null 2>&1

		# For Darwin AKA Mac OS/X (dyld)
		do_darwin-shared:
		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
		( set -x ; ${CC} --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
		lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
		-compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} \| cut -d. -f1` \
		-install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) \|\| exit 1; \
		libs="$$libs -l`basename $$i${SHLIB_EXT} .dylib`"; \
		echo "" ; \
		done

		# This assumes that GNU utilities are not used
		do_alpha-osf1-shared:
		if ${DETECT_GNU_LD}; then \
		$(MAKE) do_gnu-shared; \
		else \
		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
		( set -x; ${CC} -shared -o lib$$i.so \
		( set -x; ${CC} ${SHARED_LDFLAGS} \
		-shared -o lib$$i.so \
		-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
		-all lib$$i.a -none $$libs ${EX_LIBS} -lc ) \|\| exit 1; \
		libs="$$libs -l$$i"; \
		@@ -290,7 +304,8 @@ do_tru64-shared:
		$(MAKE) do_gnu-shared; \
		else \
		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
		( set -x; ${CC} -shared -msym -o lib$$i.so \
		( set -x; ${CC} ${SHARED_LDFLAGS} \
		-shared -msym -o lib$$i.so \
		-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
		-all lib$$i.a -none $$libs ${EX_LIBS} -lc ) \|\| exit 1; \
		libs="$$libs -l$$i"; \
		@@ -305,7 +320,8 @@ do_tru64-shared-rpath:
		$(MAKE) do_gnu-shared; \
		else \
		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
		( set -x; ${CC} -shared -msym -o lib$$i.so \
		( set -x; ${CC} ${SHARED_LDFLAGS} \
		-shared -msym -o lib$$i.so \
		-rpath ${INSTALLTOP}/lib \
		-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
		-all lib$$i.a -none $$libs ${EX_LIBS} -lc ) \|\| exit 1; \
		@@ -321,7 +337,8 @@ do_solaris-shared:
		else \
		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
		( PATH=/usr/ccs/bin:$$PATH ; export PATH; \
		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} \
		-z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) \|\| exit 1; \
		libs="$$libs -l$$i"; \
		@@ -340,7 +357,8 @@ do_svr5-shared:
		for obj in `ar t lib$$i.a` ; do \
		OBJS="$${OBJS} `grep $$obj allobjs`" ; \
		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} \
		$${OBJS} $$libs ${EX_LIBS} ) \|\| exit 1; \
		libs="$$libs -l$$i"; \
		@@ -353,7 +371,8 @@ do_irix-shared:
		$(MAKE) do_gnu-shared; \
		else \
		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
		( set -x; ${CC} -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
		( set -x; ${CC} ${SHARED_LDFLAGS} \
		-shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
		-Wl,-soname,lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
		-all lib$$i.a $$libs ${EX_LIBS} -lc) \|\| exit 1; \
		libs="$$libs -l$$i"; \
		@@ -363,7 +382,8 @@ do_irix-shared:
		# This assumes that GNU utilities are not used
		do_hpux-shared:
		libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
		( set -x; /usr/ccs/bin/ld +vnocompatwarnings \
		( set -x; /usr/ccs/bin/ld ${SHARED_LDFLAGS} \
		+vnocompatwarnings \
		-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
		+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
		-Fl lib$$i.a $$libs ${EX_LIBS} -lc ) \|\| exit 1; \
		@@ -373,7 +393,8 @@ do_hpux-shared:
		# This assumes that GNU utilities are not used
		do_hpux64-shared:
		libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
		( set -x; /usr/ccs/bin/ld -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
		( set -x; /usr/ccs/bin/ld ${SHARED_LDFLAGS} \
		-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
		+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
		+forceload lib$$i.a $$libs ${EX_LIBS} -lc ) \|\| exit 1; \
		libs="$$libs -L. -l$$i"; \
		@@ -409,7 +430,7 @@ do_hpux64-shared:
		# HP/UX-64bit: /usr/ccs/bin/ld
		# AIX: $(CC)
		ALLSYMSFLAG=-bnogc
		SHAREDFLAGS=-G -bE:lib$$i.exp -bM:SRE
		SHAREDFLAGS=${SHARED_LDFLAGS} -G -bE:lib$$i.exp -bM:SRE
		SHAREDCMD=$(CC)
		do_aix-shared:
		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

TABLE

+164 −0

File changed.

Preview size limit exceeded, changes collapsed.