Harmonize CHANGES and STATUS files between the 0.9.6a branch and

the trunk to keep diffs small.

diff --git a/CHANGES b/CHANGES
index 1a3c3eed792a234b31023346170f6918250ea5fa..1b360477212ac2444209cd1be5a9763ce649755f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,4 @@
+
  OpenSSL CHANGES
  _______________
 
@@ -424,16 +425,16 @@
      Fix leaks in PKCS12 and PKCS7 routines.
      [Steve Henson]
 
-  *) Fix for Irix with NO_ASM.
-     ["Bruce W. Forsberg" <bruce.forsberg@baesystems.com>]
-
   *) Add some EVP_add_digest_alias registrations (as found in
-     OpenSSL_add_all_digests()), to SSL_library_init()
+     OpenSSL_add_all_digests()) to SSL_library_init()
      aka OpenSSL_add_ssl_algorithms().  This provides improved
      compatibility with peers using X.509 certificates
      with unconventional AlgorithmIdentifier OIDs.
      [Bodo Moeller]
 
+  *) Fix for Irix with NO_ASM.
+     ["Bruce W. Forsberg" <bruce.forsberg@baesystems.com>]
+
   *) ./config script fixes.
      [Ulf Moeller, Richard Levitte]
 
@@ -798,6 +799,10 @@
      be handled deterministically).
      [Lenka Fibikova <fibikova@exp-math.uni-essen.de>, Bodo Moeller]
 
+  *) Add a 'bctest' script that checks for some known 'bc' bugs
+     so that 'make test' does not abort just because 'bc' is broken.
+     [Bodo Moeller]
+
   *) Store verify_result within SSL_SESSION also for client side to
      avoid potential security hole. (Re-used sessions on the client side
      always resulted in verify_result==X509_V_OK, not using the original
@@ -1082,6 +1087,9 @@
      matter what.
      [Richard Levitte]
 
+  *) Added several new manual pages for SSL_* function.
+     [Lutz Jaenicke]
+
  Changes between 0.9.5a and 0.9.6  [24 Sep 2000]
 
   *) In ssl23_get_client_hello, generate an error message when faced

diff --git a/STATUS b/STATUS
index a4f2af08bdbbd6445198f01d5b91dff4f623a7af..a01fbb9892fba5ca809630ea2da87410b1d4b114 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,11 +1,43 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2001/02/22 15:10:11 $
+  ______________                           $Date: 2001/03/22 10:59:41 $
 
   DEVELOPMENT STATE
 
     o  OpenSSL 0.9.7:  Under development...
     o  OpenSSL 0.9.6a: Bugfix release -- under 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 renamed to libswift.so.
+               [CORRECTED]
+       HP MPE/iX                               - PASSED [presumed normal]
+       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.
+               [CORRECTED]
+               In s_client.c and s_server.c, RAND_status() needs to get
+               declared (#include <openssl/rand.h>)
+               [CORRECTED]
+       OpenVMS (any version)                   - FAILED [normal+engine]
+               Missing instructions in building script.
+               [CORRECTED]
+       AIX 4.3                                 - FAILED [engine]
+               Needs -DDSO_DLFCN and -DHAVE_DLFCN_H to work.
+               [CORRECTED] (but will not be automagically configured)
+       Irix 6.5.11                             - FAILED [presumed normal]
+               BN_sqr test fails.
+        solaris64-sparcv9-cc (SunOS 5.8)        - PASSED [normal+engine]
+       BSDI 4.0.1 (bsdi-elf-gcc)               - FAILED [engine]
+               Needs -DDSO_DLFCN, -DHAVE_DLFCN_H and -ldl to work.
+               [CORRECTED]
+       mingw32 w/ gcc 2.95.2                   - PASSED [presumed normal]
+                       Beta 2 released on March 21st, 2001
     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
@@ -17,12 +49,8 @@
 
   RELEASE SHOWSTOPPERS
 
-    o
-
   AVAILABLE PATCHES
 
-    o
-
   IN PROGRESS
 
     o Steve is currently working on (in no particular order):