Prepare for 1.1.0f release

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

diff --git a/CHANGES b/CHANGES
index 4dfc73f168baae8af56650dbe49461c07d6035fb..49f9f7882c9ad94265e02e00c0f17a0d1237f0ae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
  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'.
 
   *) Have 'config' recognise 64-bit mingw and choose 'mingw64' as the target
      platform rather than 'mingw'.

diff --git a/NEWS b/NEWS
index 7f2938c2ea772e20ae2c35496b846c373049ae43..b4db8dfc66137e0702a7a750fdc657910d9b43f9 100644 (file)
--- 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.
 
   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
 
 
       o config now recognises 64-bit mingw and chooses mingw64 instead of mingw
 

diff --git a/README b/README
index 105a67630897142cd23209e0c375a7c136362db0..a7bfd7306391e48eb249697e52fa18a563371edf 100644 (file)
--- 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
 
  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 cffeb01eaf44a0c56139acf7dab6dd637627394d..f3f1d4190afd6e09f7ac6579b01f8442537b3712 100644 (file)
--- 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)
  */
  * (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
 # 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
 # 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
 
 /*-
 # endif
 
 /*-