summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--NEWS4
-rw-r--r--README2
-rw-r--r--include/openssl/opensslv.h6
4 files changed, 12 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 9f0b94743b..ae8cecaa6a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
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.0h and 1.1.0i [14 Aug 2018]
*) Client DoS due to large DH parameter
diff --git a/NEWS b/NEWS
index b6cf1f21ac..ca3ed49892 100644
--- 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.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)
diff --git a/README b/README
index 76888cbb09..3af261971e 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.1.0i 14 Aug 2018
+ 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 c5ef2a7535..72f09af882 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 0x1010009fL
+# define OPENSSL_VERSION_NUMBER 0x101000a0L
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0i-fips 14 Aug 2018"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0j-fips-dev xx XXX xxxx"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0i 14 Aug 2018"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0j-dev xx XXX xxxx"
# endif
/*-