[openssl] OpenSSL_1_1_1-stable update

[Matt Caswell]

The branch OpenSSL_1_1_1-stable has been updated
       via  9e1eaa4a400633409322ed843ca63be799cad341 (commit)
       via  a61eba4814fb748ad67e90e81c005ffb09b67d3d (commit)
      from  e7ff223a20697e5a401d2d9bb7a75e699ed46633 (commit)


- Log -----------------------------------------------------------------
commit 9e1eaa4a400633409322ed843ca63be799cad341
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 14:32:46 2020 +0000

    Prepare for 1.1.1f-dev
    
    Reviewed-by: Paul Yang <kaishen.yy at antfin.com>

commit a61eba4814fb748ad67e90e81c005ffb09b67d3d
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 17 14:31:17 2020 +0000

    Prepare for 1.1.1e release
    
    Reviewed-by: Paul Yang <kaishen.yy at antfin.com>

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

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 005ea56d40..2d1d13f7fb 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.1d and 1.1.1e [xx XXX xxxx]
+ Changes between 1.1.1e and 1.1.1f [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.1.1d and 1.1.1e [17 Mar 2020]
   *) Properly detect EOF while reading in libssl. Previously if we hit an EOF
      while reading in libssl then we would report an error back to the
      application (SSL_ERROR_SYSCALL) but errno would be 0. We now add
diff --git a/NEWS b/NEWS
index 2d2cf66c60..64722d5e92 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.1d and OpenSSL 1.1.1e [under development]
+  Major changes between OpenSSL 1.1.1e and OpenSSL 1.1.1f [under development]
+
+      o
+
+  Major changes between OpenSSL 1.1.1d and OpenSSL 1.1.1e [17 Mar 2020]
 
       o Fixed an overflow bug in the x64_64 Montgomery squaring procedure
         used in exponentiation with 512-bit moduli (CVE-2019-1551)
diff --git a/README b/README
index dc608cc25e..01a6af9ec2 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.1e-dev
+ OpenSSL 1.1.1f-dev
 
  Copyright (c) 1998-2019 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 032fb78c1c..4af9a41c75 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  0x10101050L
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1e-dev  xx XXX xxxx"
+# define OPENSSL_VERSION_NUMBER  0x10101060L
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1f-dev  xx XXX xxxx"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)