Merge of main trunk, conflicts resolved. (0dcf7fd5) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+13 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,19 @@

		Changes between 0.9.5a and 0.9.6 [xx XXX 2000]

		*) Don't set the two most significant bits to one when generating a
		random number < q in the DSA library.
		[Ulf Möller]

		*) New SSL API mode 'SSL_MODE_AUTO_RETRY'. This disables the default
		behaviour that SSL_read may result in SSL_ERROR_WANT_READ (even if
		the underlying transport is blocking) if a handshake took place.
		(The default behaviour is needed by applications such as s_client
		and s_server that use select() to determine when to use SSL_read;
		but for applications that know in advance when to expect data, it
		just makes things more complicated.)
		[Bodo Moeller]

		*) Add RAND_egd_bytes(), which gives control over the number of bytes read
		from EGD.
		[Ben Laurie]

Configure

+5 −5

Original line number	Diff line number	Diff line
		@@ -364,24 +364,24 @@ my %table=(

		# Windows NT, Microsoft Visual C++ 4.0

		"VC-NT","cl:::::BN_LLONG RC4_INDEX ${x86_gcc_opts}:::",
		"VC-WIN32","cl:::::BN_LLONG RC4_INDEX ${x86_gcc_opts}:::",
		"VC-NT","cl:::::BN_LLONG RC4_INDEX ${x86_gcc_opts}::::::::::win32",
		"VC-WIN32","cl:::::BN_LLONG RC4_INDEX ${x86_gcc_opts}::::::::::win32",
		"VC-WIN16","cl:::(unknown)::MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX THIRTY_TWO_BIT:::",
		"VC-W31-16","cl:::(unknown)::BN_LLONG MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX SIXTEEN_BIT:::",
		"VC-W31-32","cl:::::BN_LLONG MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX THIRTY_TWO_BIT:::",
		"VC-MSDOS","cl:::(unknown)::BN_LLONG MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX SIXTEEN_BIT:::",

		# Borland C++ 4.5
		"BC-32","bcc32:::::BN_LLONG DES_PTR RC4_INDEX:::",
		"BC-32","bcc32:::::BN_LLONG DES_PTR RC4_INDEX::::::::::win32",
		"BC-16","bcc:::(unknown)::BN_LLONG DES_PTR RC4_INDEX SIXTEEN_BIT:::",

		# Mingw32
		# (Note: the real CFLAGS for Windows builds are defined by util/mk1mf.pl
		# and its library files in util/pl/*)
		"Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:",
		"Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",

		# CygWin32
		"CygWin32", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:",
		"CygWin32", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",

		# Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at>
		"ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown)::::::",

STATUS

+22 −4

Original line number	Diff line number	Diff line

		OpenSSL STATUS Last modified at
		______________ $Date: 2000/09/12 08:37:49 $
		______________ $Date: 2000/09/13 21:20:43 $

		DEVELOPMENT STATE

		o OpenSSL 0.9.6: Under development (in release cycle)...
		Proposed release date September 24, 2000
		0.9.6-beta1 is available:
		OpenBSD-x86 2.7 - failed (ftime/TIMEB)
		OpenBSD-x86 2.7 - failed
		ftime not supported [FIXED]
		hpux-parisc-cc 10.20 - passed
		hpux-parisc-gcc 10.20 - passed
		hpux-parisc-gcc 11.00 - passed
		hpux-gcc - passed
		hpux-brokengcc - failed (BN_sqr)
		hpux-brokengcc - failed
		BN_sqr fails in test
		linux-elf - passed
		linux-sparcv7 - passed
		Solaris [engine] - failed (speed cswift)
		linux-ppc - passed
		Solaris [engine] - failed
		speed cswift gives odd errors [FIXED]
		solaris-sparcv8-gcc - passed
		solaris-sparcv9-gcc - passed
		solaris-sparcv9-cc - passed
		solaris64-sparcv9-cc - passed
		sco5-gcc - passed
		sco5-cc - passed
		FreeBSD - passed
		Win32 VC++ - failed
		PCURSORINFO not defined unless Win2000 [FIXED]
		RAND_poll() problem on Win2000 [FIXED]
		DSO method always DSO_METHOD_null [FIXED]
		CygWin32 - test failed
		MingW32 - failed
		thelp32.h
		aix-gcc (AIX 4.3.2) - passed
		o OpenSSL 0.9.5a: Released on April 1st, 2000
		o OpenSSL 0.9.5: Released on February 28th, 2000
		o OpenSSL 0.9.4: Released on August 09th, 1999

crypto/dsa/dsa_key.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ int DSA_generate_key(DSA *dsa)
		i=BN_num_bits(dsa->q);
		for (;;)
		{
		if (!BN_rand(priv_key,i,1,0))
		if (!BN_rand(priv_key,i,0,0))
		goto err;
		if (BN_cmp(priv_key,dsa->q) >= 0)
		BN_sub(priv_key,priv_key,dsa->q);

crypto/dsa/dsa_ossl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ static int dsa_sign_setup(DSA dsa, BN_CTX ctx_in, BIGNUM kinvp, BIGNUM rp)
		/* Get random k */
		for (;;)
		{
		if (!BN_rand(&k, BN_num_bits(dsa->q), 1, 0)) goto err;
		if (!BN_rand(&k, BN_num_bits(dsa->q), 0, 0)) goto err;
		if (BN_cmp(&k,dsa->q) >= 0)
		BN_sub(&k,&k,dsa->q);
		if (!BN_is_zero(&k)) break;