From: Matt Caswell <matt@openssl.org>
Date: Thu, 22 Sep 2016 10:30:27 +0000 (+0100)
Subject: Prepare for 1.0.1u release
X-Git-Tag: OpenSSL_1_0_1u^0
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=888759a1d38197f29de7227876c3b58fbff8549f;p=oweals%2Fopenssl.git

Prepare for 1.0.1u release

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

diff --git a/CHANGES b/CHANGES
index c33f7cfa1e..6f7cda1f61 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.1t and 1.0.1u [xx XXX xxxx]
+ Changes between 1.0.1t and 1.0.1u [22 Sep 2016]
 
   *) OCSP Status Request extension unbounded memory growth
 
diff --git a/NEWS b/NEWS
index 61c02ebfa1..686ae2490a 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.1t and OpenSSL 1.0.1u [under development]
+  Major changes between OpenSSL 1.0.1t and OpenSSL 1.0.1u [22 Sep 2016]
 
       o OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
       o SWEET32 Mitigation (CVE-2016-2183)
diff --git a/README b/README
index 09474525bf..96fecaa6f5 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.1u-dev
+ OpenSSL 1.0.1u 22 Sep 2016
 
  Copyright (c) 1998-2015 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index a71ca2c4fa..4d014f430c 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x10001150L
+# define OPENSSL_VERSION_NUMBER  0x1000115fL
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1u-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1u-fips  22 Sep 2016"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1u-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1u  22 Sep 2016"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT