Merge in changes from 0.9.7-stable.

diff --git a/CHANGES b/CHANGES
index 38e81e8a2fd073aadba41ae91c873480582508c9..ac48f515bcf9e05d9a20e87e89de00e060e9e3a9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -350,7 +350,7 @@ TODO: bug: pad  x  with leading zeros if necessary
          EC_GROUP_get_nid()
      [Nils Larsch <nla@trustcenter.de, Bodo Moeller]
  
          EC_GROUP_get_nid()
      [Nils Larsch <nla@trustcenter.de, Bodo Moeller]
  

- Changes between 0.9.6h and 0.9.7  [XX xxx 2002]
+ Changes between 0.9.6h and 0.9.7  [31 Dec 2002]

 
   *) Fix session ID handling in SSLv2 client code: the SERVER FINISHED
      code (06) was taken as the first octet of the session ID and the last
 
   *) Fix session ID handling in SSLv2 client code: the SERVER FINISHED
      code (06) was taken as the first octet of the session ID and the last

diff --git a/FAQ b/FAQ
index 6e007f8a1de0e75f358070794dbd6ca7ef97bc22..9d1b0bb6c1b5149ea4400b3a8e44b0ef5821863e 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -68,7 +68,7 @@ OpenSSL  -  Frequently Asked Questions
 * Which is the current version of OpenSSL?
 
 The current version is available from <URL: http://www.openssl.org>.
 * Which is the current version of OpenSSL?
 
 The current version is available from <URL: http://www.openssl.org>.

-OpenSSL 0.9.6h was released on December 5, 2002.
+OpenSSL 0.9.7 was released on December 31, 2002.

 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:

diff --git a/STATUS b/STATUS
index 3f9f3ccbf1dbff3b5f194d86feadafdadf246249..a9e7f99224cbcd2f1466c7183d4c554ba2f017ad 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,31 +1,11 @@
 
   OpenSSL STATUS                           Last modified at
 
   OpenSSL STATUS                           Last modified at

-  ______________                           $Date: 2002/12/27 15:04:45 $
+  ______________                           $Date: 2002/12/30 23:56:09 $

 
   DEVELOPMENT STATE
 
     o  OpenSSL 0.9.8:  Under development...
 
   DEVELOPMENT STATE
 
     o  OpenSSL 0.9.8:  Under development...

-    o  OpenSSL 0.9.7-beta6: Released on December 17th, 2002
-       Solaris on Sun Ultra (Workshop 6 update 1)      - PASSED with warnings
-                                                         (warnings fixed)
-       Redhat 8 on i386 (gcc 3.2)                      - PASSED
-       Debian GNU/Linux on i386 (kernel 2.4.19, gxx 2.95.4) - PASSED
-       Windows CE on HPC Pro 2.11                      - PASSED
-       Windows CE on HPC 2000                          - PASSED
-       Windows CE on PocketPC 2000                     - PASSED
-       Windows CE on PocketPC 2002                     - PASSED
-       VMS (>=6.0 on any platform, DEC C)              - ERROR
-                                                         (errors fixed
-                                                         PR: 407, 413)
-       Windows with MIT Kerberos                       - PASSED
-       Windows 2000 (Cygwin)                           - ERROR
-                                                         (PR: 404)
-       SCO OpenServer, Unixware?                       - ERROR
-    o  OpenSSL 0.9.7-beta5: Released on December  5th, 2002
-    o  OpenSSL 0.9.7-beta4: Released on November 19th, 2002
-    o  OpenSSL 0.9.7-beta3: Released on July     30th, 2002
-    o  OpenSSL 0.9.7-beta2: Released on June     16th, 2002
-    o  OpenSSL 0.9.7-beta1: Released on June      1st, 2002
+    o  OpenSSL 0.9.7:  Released on December  31st, 2002

     o  OpenSSL 0.9.6h: Released on December   5th, 2002
     o  OpenSSL 0.9.6g: Released on August     9th, 2002
     o  OpenSSL 0.9.6f: Released on August     8th, 2002
     o  OpenSSL 0.9.6h: Released on December   5th, 2002
     o  OpenSSL 0.9.6g: Released on August     9th, 2002
     o  OpenSSL 0.9.6f: Released on August     8th, 2002