diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-09-20 16:40:10 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-09-20 16:40:10 +0000 |
| commit | 103a60493248ede5b801711aa640f2086322a12c (patch) | |
| tree | d3c86d71d90b1cabf651b4a93971a4769ff6ae2a | |
| parent | 12f49bd79d17f0a325f89738f06f1332b705e64a (diff) | |
| download | openssl-103a60493248ede5b801711aa640f2086322a12c.tar.gz | |
Merge of main trunk, all conflicts resolved.
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | STATUS | 21 | ||||
| -rw-r--r-- | apps/speed.c | 2 |
3 files changed, 21 insertions, 7 deletions
@@ -12,7 +12,12 @@ o New sign and verify options to 'dgst' application. o Support for DER and PEM encoded messages in 'smime' application. o New 'rsautl' application, low level RSA utility. + o MD4 now included. + o Bugfix for SSL rollback padding check. + o Support for external crypto device[1]. + [1] The support for external crypto devices is currently a separate + distribution. See the file README.ENGINE. Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a: @@ -1,6 +1,6 @@ OpenSSL STATUS Last modified at - ______________ $Date: 2000/09/20 13:45:41 $ + ______________ $Date: 2000/09/20 16:40:09 $ DEVELOPMENT STATE @@ -65,16 +65,25 @@ All hpux 10.20 targets succeeded provided -ldl has been changed to -ldld. solaris-sparcv9-gcc (2.6/ultra5) - success - solaris-sparcv9-cc (SunOS 5.7 SC3.0) - failed - Complaints about a number of -x parameters to - the compiler and failed to compile an - assembler file. Maybe a too old - compiler? + [ solaris-sparcv9-cc (SunOS 5.7 SC3.0) - failed ] + [ Complaints about a number of -x parameters to ] + [ the compiler and failed to compile an ] + [ assembler file. Maybe a too old ] + [ compiler? (Yes, apparently:) ] + solaris-sparcv9-cc (SunOS 5.6 SC4.2) - success FreeBSD (2.2.5-RELEASE) - success alpha-cc [engine] (OSF1 5.0A) - success irix-mips3-cc [engine] (Irix 6.2) - success One has to do the same as for OpenBSD in speed.c [FIXED] + aix-cc (3.2.5, cc 1.3.0.44) - success + aix-gcc (3.2.5, gcc 2.8.1) - success + Both first failed to compiled due to ftime(). + [FIXED] + alpha-cc (V4.0E) - success + alpha-gcc (V4.0E, gcc 2.8.1) - success + ultrix-cc (V4.5) - success + ultrix-gcc (V4.5, gcc 2.8.1) - success 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 diff --git a/apps/speed.c b/apps/speed.c index dfaa506bb1..05a960c7d1 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -88,7 +88,7 @@ #elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) # define TIMES #endif -#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) +#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) # define TIMEB #endif |