[openssl] OpenSSL_1_1_1-stable update

[Matt Caswell]

The branch OpenSSL_1_1_1-stable has been updated
       via  ce843e36d65e22e5681e8b81301f1ebd045c3109 (commit)
       via  36eadf1f84daa965041cce410b4ff32cbda4ef08 (commit)
      from  c855c9c05ad5e5d3cbc7bb282b483c698e90f8ec (commit)


- Log -----------------------------------------------------------------
commit ce843e36d65e22e5681e8b81301f1ebd045c3109
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 31 13:19:19 2020 +0100

    Prepare for 1.1.1g-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 36eadf1f84daa965041cce410b4ff32cbda4ef08
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 31 13:17:45 2020 +0100

    Prepare for 1.1.1f release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/CHANGES b/CHANGES
index bfd072965f..5a4c77cca6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,11 @@
  https://github.com/openssl/openssl/commits/ and pick the appropriate
  release branch.
 
- Changes between 1.1.1e and 1.1.1f [xx XXX xxxx]
+ Changes between 1.1.1f and 1.1.1g [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.1.1e and 1.1.1f [31 Mar 2020]
 
   *) Revert the change of EOF detection while reading in libssl to avoid
      regressions in applications depending on the current way of reporting
diff --git a/NEWS b/NEWS
index 056e46d137..79202c3af2 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.1e and OpenSSL 1.1.1f [under development]
+  Major changes between OpenSSL 1.1.1f and OpenSSL 1.1.1g [under development]
+
+      o
+
+  Major changes between OpenSSL 1.1.1e and OpenSSL 1.1.1f [31 Mar 2020]
 
       o Revert the unexpected EOF reporting via SSL_ERROR_SSL
 
diff --git a/README b/README
index d47ee8834c..2fa731e0a9 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.1f-dev
+ OpenSSL 1.1.1g-dev
 
  Copyright (c) 1998-2020 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 6d0af05402..3e4c167af1 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -39,8 +39,8 @@ 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  0x10101060L
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1f-dev  xx XXX xxxx"
+# define OPENSSL_VERSION_NUMBER  0x10101070L
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1g-dev  xx XXX xxxx"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)