[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  b9ff4ec746daafe520e36c1489a2f843401ab140 (commit)
       via  577d7010c6ffa98e8dc61d8826693db9d8f57bd5 (commit)
      from  058253ada225c01e1a87ec6cb063627b9295ac37 (commit)


- Log -----------------------------------------------------------------
commit b9ff4ec746daafe520e36c1489a2f843401ab140
Author: Matt Caswell <matt at openssl.org>
Date:   Thu May 25 13:47:35 2017 +0100

    Prepare for 1.1.0g-dev
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit 577d7010c6ffa98e8dc61d8826693db9d8f57bd5
Author: Matt Caswell <matt at openssl.org>
Date:   Thu May 25 13:46:16 2017 +0100

    Prepare for 1.1.0f release
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES                    | 6 +++++-
 NEWS                       | 6 +++++-
 README                     | 2 +-
 include/openssl/opensslv.h | 6 +++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4dfc73f..1da3e9b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,11 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.1.0e and 1.1.0f [xx XXX xxxx]
+ Changes between 1.1.0f and 1.1.0g [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 7f2938c..0332a0c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,11 @@
   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.0f and OpenSSL 1.1.0g [under development]
+
+      o
+
+  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 105a676..6f88dc7 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0f-dev
+ OpenSSL 1.1.0g-dev
 
  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 cffeb01..ae56705 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  0x10100070L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0g-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0g-dev  xx XXX xxxx"
 # endif
 
 /*-