Merge in recent changes from OpenSSL-0_9_6-stable

diff --git a/README b/README
index 52121bd6b25074f37ee68b416f3d77293ba4c62e..936830b37f75bc2e8726f9e5bec27c49a7534b59 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- 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

diff --git a/STATUS b/STATUS
index 90f1cab51bf8d37444aefe53f2a017591f590f4f..182f17946002fcefdca0de84fe8e186eb557b0e7 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,11 +1,30 @@
 
   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

diff --git a/apps/passwd.c b/apps/passwd.c
index 533b4692d0534f66eb97546b2a5ec78bc9c7260e..ea2b089e24a73762fd027f997f5a34b5ef9e9487 100644 (file)
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -272,6 +272,7 @@ int MAIN(int argc, char **argv)
                        }
                while (!done);
                }
+       ret = 0;
 
 err:
        ERR_print_errors(bio_err);

diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 33695c87baee0c211bf624477f58e33c6a470268..8941ed75feb16ee37fc32e621b71b59da8382f23 100644 (file)
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -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
 
 

diff --git a/ms/16all.bat b/ms/16all.bat
index e57e177177b3271baca76a0470a9f0083e747628..505aa9f3f9d773d45d2f2c87c07ca2e8766e7438 100755 (executable)
--- a/ms/16all.bat
+++ b/ms/16all.bat
@@ -1,6 +1,7 @@
 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

diff --git a/ms/32all.bat b/ms/32all.bat
index d1f014c4e0f67256331437b174380b3fe35fd6e8..b4908fc6ce82d5e9670e7d60c6015eaa9a9cfd83 100755 (executable)
--- a/ms/32all.bat
+++ b/ms/32all.bat
@@ -1,6 +1,7 @@
 set OPTS=no-asm
 
 perl Configure VC-WIN32
+perl util\mkfiles.pl >MINFO
 perl util\mk1mf.pl %OPTS% debug VC-WIN32 >d32.mak
 perl util\mk1mf.pl %OPTS% VC-WIN32 >32.mak
 perl util\mk1mf.pl %OPTS% debug dll VC-WIN32 >d32dll.mak