Merge recent changes from 0.9.6-stable.

diff --git a/CHANGES b/CHANGES
index 9dec277f015e7ebe846970dad53924f9fb50af22..2e37b908c03aedae8e9712776425bb03c09eca1c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 0.9.6d and 0.9.6e  [XX xxx XXXX]
+
+  *) 
+
  Changes between 0.9.6c and 0.9.6d  [9 May 2002]
 
   *) Fix crypto/asn1/a_sign.c so that 'parameters' is omitted (not

diff --git a/STATUS b/STATUS
index 938f058dcfe90e70fd23bf00752a9cfe715c0ddc..244fc02fe80481ead79b18ab6dd8e7b3405e8162 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,11 +1,11 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2002/05/08 15:53:53 $
+  ______________                           $Date: 2002/05/10 01:02:22 $
 
   DEVELOPMENT STATE
 
     o  OpenSSL 0.9.7:  Under development...
-    o  OpenSSL 0.9.6d: Feature freeze, beta1 April 17th, 2002
+    o  OpenSSL 0.9.6d: Released on May        9th, 2002
     o  OpenSSL 0.9.6c: Released on December  21st, 2001
     o  OpenSSL 0.9.6b: Released on July       9th, 2001
     o  OpenSSL 0.9.6a: Released on April      5th, 2001

diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 374fbadd79ddb46801bd1a855050472d04d317e8..9c6499ef9d2a1956334b98c1624db6edb479bf5a 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 0x0090604fL
-#define OPENSSL_VERSION_TEXT   "OpenSSL 0.9.6d [engine] 9 May 2002"
+#define OPENSSL_VERSION_NUMBER 0x00906050L
+#define OPENSSL_VERSION_TEXT   "OpenSSL 0.9.6e-dev [engine] 9 May 2002"
 #define OPENSSL_VERSION_PTEXT  " part of " OPENSSL_VERSION_TEXT