Commit 69043fa1 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge recent changes from 0.9.6-stable.

parent e0b11026

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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

STATUS

+2 −2
Original line number Diff line number Diff line 


  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

crypto/opensslv.h

+2 −2
Original line number Diff line number Diff line
@@ -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