From: Matt Caswell <matt@openssl.org>
Date: Thu, 25 May 2017 12:46:16 +0000 (+0100)
Subject: Prepare for 1.1.0f release
X-Git-Tag: OpenSSL_1_1_0f^0
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=577d7010c6ffa98e8dc61d8826693db9d8f57bd5

Prepare for 1.1.0f release

Reviewed-by: Stephen Henson <steve@openssl.org>
---

diff --git a/CHANGES b/CHANGES
index 4dfc73f168..49f9f7882c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.1.0e and 1.1.0f [xx XXX xxxx]
+ Changes between 1.1.0e and 1.1.0f [25 May 2017]
 
   *) Have 'config' recognise 64-bit mingw and choose 'mingw64' as the target
      platform rather than 'mingw'.
diff --git a/NEWS b/NEWS
index 7f2938c2ea..b4db8dfc66 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.1.0e and OpenSSL 1.1.0f [under development]
+  Major changes between OpenSSL 1.1.0e and OpenSSL 1.1.0f [25 May 2017]
 
       o config now recognises 64-bit mingw and chooses mingw64 instead of mingw
 
diff --git a/README b/README
index 105a676308..a7bfd73063 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0f-dev
+ OpenSSL 1.1.0f 25 May 2017
 
  Copyright (c) 1998-2016 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index cffeb01eaf..f3f1d4190a 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -39,11 +39,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  0x10100060L
+# define OPENSSL_VERSION_NUMBER  0x1010006fL
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-fips  25 May 2017"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f  25 May 2017"
 # endif
 
 /*-