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

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  d706faf38da07083cb2116f4d30422081bc8ae1d (commit)
       via  97c0959f27b294fe1eb10b547145ebef2524b896 (commit)
      from  6244f531776a0c53fa35f815cbc588988b343036 (commit)


- Log -----------------------------------------------------------------
commit d706faf38da07083cb2116f4d30422081bc8ae1d
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Aug 14 13:46:03 2018 +0100

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

commit 97c0959f27b294fe1eb10b547145ebef2524b896
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Aug 14 13:45:05 2018 +0100

    Prepare for 1.1.0i release
    
    Reviewed-by: Richard Levitte <levitte 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 faf5a3c..ae8ceca 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.0h and 1.1.0i [xx XXX xxxx]
+ Changes between 1.1.0i and 1.1.0j [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.1.0h and 1.1.0i [14 Aug 2018]
 
   *) Client DoS due to large DH parameter
 
diff --git a/NEWS b/NEWS
index 9f6e3cf..ca3ed49 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.0h and OpenSSL 1.1.0i [under development]
+  Major changes between OpenSSL 1.1.0i and OpenSSL 1.1.0j [under development]
+
+      o
+
+  Major changes between OpenSSL 1.1.0h and OpenSSL 1.1.0i [14 Aug 2018]
 
       o Client DoS due to large DH parameter (CVE-2018-0732)
       o Cache timing vulnerability in RSA Key Generation (CVE-2018-0737)
diff --git a/README b/README
index 40dbcfa..3af2619 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0i-dev
+ OpenSSL 1.1.0j-dev
 
  Copyright (c) 1998-2018 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 7221a45..72f09af 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  0x10100090L
+# define OPENSSL_VERSION_NUMBER  0x101000a0L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0i-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0j-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0i-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0j-dev  xx XXX xxxx"
 # endif
 
 /*-