Commit 81741de6 authored by Matt Caswell's avatar Matt Caswell
Browse files

Prepare for 1.0.0r release 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent f2f2f64d

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 OpenSSL CHANGES

 _______________



 Changes between 1.0.0q and 1.0.0r [xx XXX xxxx]

 Changes between 1.0.0q and 1.0.0r [19 Mar 2015]



  *) Segmentation fault in ASN1_TYPE_cmp fix

NEWS

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  This file gives a brief overview of the major changes between each OpenSSL

  release. For more details please read the CHANGES file.



  Major changes between OpenSSL 1.0.0q and OpenSSL 1.0.0r [under development]

  Major changes between OpenSSL 1.0.0q and OpenSSL 1.0.0r [19 Mar 2015]



      o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)

      o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)

README

+1 −1
Original line number Diff line number Diff line 


 OpenSSL 1.0.0r-dev

 OpenSSL 1.0.0r 19 Mar 2015



 Copyright (c) 1998-2011 The OpenSSL Project

 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

crypto/opensslv.h

+3 −3
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ 
 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for

 *  major minor fix final patch/beta)

 */

# define OPENSSL_VERSION_NUMBER  0x10000120L

# define OPENSSL_VERSION_NUMBER  0x1000012fL

# ifdef OPENSSL_FIPS

#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0r-fips-dev xx XXX xxxx"

#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0r-fips 19 Mar 2015"

# else

#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0r-dev xx XXX xxxx"

#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0r 19 Mar 2015"

# endif

# define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT