[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6536f0741c9c9d0e7a76d0abfdf5bf3893330982 (commit)
      from  5d92b853f6b875ba8d1a1b51b305f14df5adb8aa (commit)


- Log -----------------------------------------------------------------
commit 6536f0741c9c9d0e7a76d0abfdf5bf3893330982
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Aug 21 13:11:12 2018 +0100

    Fix a version error in CHANGES and NEWS
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7019)

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

Summary of changes:
 CHANGES | 2 +-
 NEWS    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 760160f..e2e61bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
  https://github.com/openssl/openssl/commits/ and pick the appropriate
  release branch.
 
- Changes between 1.1.0h and 1.1.1 [xx XXX xxxx]
+ Changes between 1.1.0i and 1.1.1 [xx XXX xxxx]
 
   *) s390x assembly pack: add (improved) hardware-support for the following
      cryptographic primitives: sha3, shake, aes-gcm, aes-ccm, aes-ctr, aes-ofb,
diff --git a/NEWS b/NEWS
index 1f98b93..9ac7456 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.0h and OpenSSL 1.1.1 [in pre-release]
+  Major changes between OpenSSL 1.1.0i and OpenSSL 1.1.1 [in pre-release]
 
       o Support for TLSv1.3 added
       o Move the display of configuration data to configdata.pm.