Merge from 0.9.6-stable. (b435c38a) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Configure

+4 −1

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ my %table=(
		"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::",
		# it's a real mess with -mcpu=ultrasparc option under Linux, but
		# -Wa,-Av8plus should do the trick no matter what.
		"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o:",
		"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		# !!!Folowing can't be even tested yet!!!
		# We have to wait till 64-bit glibc for SPARC is operational!!!
		#"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:",
		@@ -500,6 +500,9 @@ my %table=(
		##### Sony NEWS-OS 4.x
		"newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",

		##### VxWorks for various targets
		"vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DVXWORKS -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::-r:::::",

		);

		my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32

INSTALL.W32

+18 −18

Original line number	Diff line number	Diff line
		@@ -6,15 +6,15 @@
		of this is tested on Win32 but it may also work in Win 3.1 with some
		modification.

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

		and one of the following C compilers:

		* Visual C++
		* Borland C
		* GNU C (Mingw32 or Cygwin32)
		* GNU C (Mingw32 or Cygwin)

		If you want to compile in the assembly language routines with Visual C++ then
		you will need an assembler. This is worth doing because it will result in
		@@ -137,30 +137,30 @@
		> cd out
		> ..\ms\test

		GNU C (CygWin32)
		---------------
		GNU C (Cygwin)
		--------------

		CygWin32 provides a bash shell and GNU tools environment running on
		Cygwin provides a bash shell and GNU tools environment running on
		NT 4.0, Windows 9x and Windows 2000. Consequently, a make of OpenSSL
		with CygWin is closer to a GNU bash environment such as Linux rather
		with Cygwin is closer to a GNU bash environment such as Linux rather
		than other W32 makes that are based on a single makefile approach.
		CygWin32 implements Posix/Unix calls through cygwin1.dll, and is
		Cygwin implements Posix/Unix calls through cygwin1.dll, and is
		contrasted to Mingw32 which links dynamically to msvcrt.dll or
		crtdll.dll.

		To build OpenSSL using CygWin32:
		To build OpenSSL using Cygwin:

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

		* 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
		* Run the Cygwin bash shell

		* $ tar zxvf openssl-x.x.x.tar.gz
		$ cd openssl-x.x.x
		$ ./Configure no-threads CygWin32
		$ ./config
		[...]
		$ make
		[...]
		@@ -169,26 +169,26 @@

		This will create a default install in /usr/local/ssl.

		CygWin32 Notes:
		Cygwin Notes:

		"make test" and normal file operations may fail in directories
		mounted as text (i.e. mount -t c:\somewhere /home) due to CygWin
		mounted as text (i.e. mount -t c:\somewhere /home) due to Cygwin
		stripping of carriage returns. To avoid this ensure that a binary
		mount is used, e.g. mount -b c:\somewhere /home.

		As of version 1.1.1 CygWin32 is relatively unstable in its handling
		As of version 1.1.1 Cygwin is relatively unstable in its handling
		of cr/lf issues. These make procedures succeeded with versions 1.1 and
		the snapshot 20000524 (Slow!).

		"bc" is not provided in the CygWin32 distribution. This causes a
		"bc" is not provided in the Cygwin distribution. This causes a
		non-fatal error in "make test" but is otherwise harmless. If
		desired, GNU bc can be built with CygWin32 without change.
		desired, GNU bc can be built with Cygwin without change.


		Installation
		------------

		If you used the CygWin procedure above, you have already installed and
		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:

STATUS

+1 −5

Original line number	Diff line number	Diff line

		OpenSSL STATUS Last modified at
		______________ $Date: 2001/12/21 03:23:29 $
		______________ $Date: 2002/02/26 13:41:15 $

		DEVELOPMENT STATE

		@@ -48,10 +48,6 @@

		o apps/ca.c: "Sign the certificate?" - "n" creates empty certificate file

		o OpenSSL_0_9_6-stable:
		#include <openssl/e_os.h> in exported header files is illegal since
		e_os.h is suitable only for library-internal use.

		o Whenever strncpy is used, make sure the resulting string is NULL-terminated
		or an error is reported

apps/ca.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@
		# else
		# include <unixlib.h>
		# endif
		# else
		# elif !defined(VXWORKS)
		# include <sys/file.h>
		# endif
		#endif

apps/s_time.c

+20 −2

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@
		#include "wintext.h"
		#endif

		#if !defined(MSDOS) && (!defined(VMS) \|\| defined(__DECC)) \|\| defined (_DARWIN)
		#if !defined(MSDOS) && !defined(VXWORKS) && (!defined(VMS) \|\| defined(__DECC)) \|\| defined (_DARWIN)
		#define TIMES
		#endif

		@@ -102,7 +102,7 @@
		#undef TIMES
		#endif

		#ifndef TIMES
		#if !defined(TIMES) && !defined(VXWORKS)
		#include <sys/timeb.h>
		#endif

		@@ -139,6 +139,8 @@
		#undef BUFSIZZ
		#define BUFSIZZ 1024*10

		#undef min
		#undef max
		#define min(a,b) (((a) < (b)) ? (a) : (b))
		#define max(a,b) (((a) > (b)) ? (a) : (b))

		@@ -368,6 +370,22 @@ static double tm_Time_F(int s)
		ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
		return((ret == 0.0)?1e-6:ret);
		}
		#elif defined(VXWORKS)
		{
		static unsigned long tick_start, tick_end;

		if( s == START )
		{
		tick_start = tickGet();
		return 0;
		}
		else
		{
		tick_end = tickGet();
		ret = (double)(tick_end - tick_start) / (double)sysClkRateGet();
		return((ret == 0.0)?1e-6:ret);
		}
		}
		#else /* !times() */
		static struct timeb tstart,tend;
		long i;