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

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  0fbe8491fc05d280a1f00bfc26dd3c3a6c63f04a (commit)
       via  74f2d9c1ec5f5510e1d3da5a9f03c28df0977762 (commit)
      from  a8e613cc51beaeb181a322da3620a27ef8bcead3 (commit)


- Log -----------------------------------------------------------------
commit 0fbe8491fc05d280a1f00bfc26dd3c3a6c63f04a
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 20 13:42:16 2018 +0000

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

commit 74f2d9c1ec5f5510e1d3da5a9f03c28df0977762
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 20 13:41:22 2018 +0000

    Prepare for 1.1.0j 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 cb2e6b1..60c0dd1 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.0i and 1.1.0j [xx XXX xxxx]
+ Changes between 1.1.0j and 1.1.0k [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.1.0i and 1.1.0j [20 Nov 2018]
 
   *) Timing vulnerability in DSA signature generation
 
diff --git a/NEWS b/NEWS
index 88a0be4..188e9aa 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.0i and OpenSSL 1.1.0j [under development]
+  Major changes between OpenSSL 1.1.0j and OpenSSL 1.1.0k [under development]
+
+      o
+
+  Major changes between OpenSSL 1.1.0i and OpenSSL 1.1.0j [20 Nov 2018]
 
       o Timing vulnerability in DSA signature generation (CVE-2018-0734)
       o Timing vulnerability in ECDSA signature generation (CVE-2018-0735)
diff --git a/README b/README
index 3af2619..51828a7 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0j-dev
+ OpenSSL 1.1.0k-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 72f09af..0e2992e 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  0x101000a0L
+# define OPENSSL_VERSION_NUMBER  0x101000b0L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0j-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0k-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0j-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0k-dev  xx XXX xxxx"
 # endif
 
 /*-