Commit df9badad authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in recent changes from OpenSSL-0_9_6-stable

parent c4af8daf

README

+1 −1
Original line number Diff line number Diff line 


 OpenSSL 0.9.6a-beta1 [engine] 13 Mar 2001

 OpenSSL 0.9.6a-beta2 [engine] XX xxx XXXX



 Copyright (c) 1998-2000 The OpenSSL Project

 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

STATUS

+20 −1
Original line number Diff line number Diff line 


  OpenSSL STATUS                           Last modified at

  ______________                           $Date: 2001/03/13 16:39:20 $

  ______________                           $Date: 2001/03/14 11:38:40 $



  DEVELOPMENT STATE



    o  OpenSSL 0.9.6a: In development...

                       Beta 1 released on March 13th, 2001

	HP-UX 10.20 (hpux-parisc-cc)		- PASSED [normal+engine]

	HP-UX 10.20 (hpux-parisc-gcc)		- PASSED [normal+engine]

	HP-UX 11.00 32bit (hpux-parisc-gcc)	- FAILED [engine]

		"openssl speed rsa1024 -engine cswift" fails unless

		libswift.sl is in $CWD, even if $SHLIB_PATH is defined.

	Linux 2.2.17 SMP (linux-elf)		- PASSED [normal+engine]

	Windows (VC-WIN32)			- FAILED [presumed normal]

		Missing line in ms/32all.bat:

			perl util\mkfiles.pl >MINFO

		[CORRECTED]

		In randfile.c, line 214, signed and unsigned int are mixed.

		In s_client.c and s_server.c, RAND_status() needs to get

		declared (#include <oenssl/rand.h>)

	OpenVMS (any version)			- FAILED [normal+engine]

		Missing istructions in building script.

	AIX 4.3					- FAILED [engine]

		Needs -DDSO_DLFCN and -DHAVE_DLFCN_H to work.

	Irix 6.5.11				- FAILED [presumed normal]

		BN_sqr test fails.

    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

apps/passwd.c

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ int MAIN(int argc, char **argv) 
			}

		while (!done);

		}

	ret = 0;



err:

	ERR_print_errors(bio_err);

crypto/opensslv.h

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for

 *  major minor fix final patch/beta)

 */

#define OPENSSL_VERSION_NUMBER	0x00906011L

#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.6a-beta1 [engine] 13 Mar 2001"

#define OPENSSL_VERSION_NUMBER	0x00906012L

#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.6a-beta2-dev [engine] XX xxx XXXX"

#define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT

ms/16all.bat

+1 −0
Original line number Diff line number Diff line 
set OPTS=no_asm



perl Configure VC-WIN16

perl util\mkfiles.pl >MINFO

perl util\mk1mf.pl %OPTS% debug VC-WIN16 >d16.mak

perl util\mk1mf.pl %OPTS% VC-WIN16 >16.mak

perl util\mk1mf.pl %OPTS% debug dll VC-WIN16 >d16dll.mak