Prepare for 1.1.0k-dev

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/CHANGES b/CHANGES
index cf76704d15cd7a61165510362797207ef230f276..60c0dd119ff332c7cb61fa9df8380254ba057483 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
  https://github.com/openssl/openssl/commits/ and pick the appropriate
  release branch.
 
+ 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 983fceb2bbe7e81d3cbd9e5e795db6101e203941..188e9aa0b30cdea7add66c4fb979522ece8eb7ae 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@
   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.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)

diff --git a/README b/README
index 46947019097071b1985e29f5bb34f57cf79e966a..51828a76001e7444b157c7f103814641ace4d344 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0j 20 Nov 2018
+ 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 49f3c0a780a0cecaee49c96fd53bbabdeb11f34d..0e2992eb636381a27edf0d42f374674af7e85c71 100644 (file)
--- 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  0x101000afL
+# define OPENSSL_VERSION_NUMBER  0x101000b0L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0j-fips  20 Nov 2018"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0k-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0j  20 Nov 2018"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0k-dev  xx XXX xxxx"
 # endif
 
 /*-