From: Matt Caswell <matt@openssl.org>
Date: Thu, 19 Mar 2015 13:43:00 +0000 (+0000)
Subject: Prepare for 1.0.0r release
X-Git-Tag: OpenSSL_1_0_0r^0
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=81741de632c9952d8b25afd15a280ff6424931b3;p=oweals%2Fopenssl.git

Prepare for 1.0.0r release

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/CHANGES b/CHANGES
index 2be150866e..409f129e6d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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
 
diff --git a/NEWS b/NEWS
index 7edbb37b63..2cf99156d9 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
diff --git a/README b/README
index 4f67e9ec88..045c69b526 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- 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
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 5faedaa31d..4299f8a4ed 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -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