summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Levitte <richard@levitte.org>2019-05-28 14:59:22 +0200
committerRichard Levitte <richard@levitte.org>2019-05-28 14:59:22 +0200
commitd9b6a51e926bfd1f86eac9de5dcbc28541fcf99f (patch)
tree6ebc9384c672571935d466b47cef12342ab6afc2
parentfb83aaf6a163438149570b344c6c75a6aa977ae9 (diff)
downloadopenssl-new-d9b6a51e926bfd1f86eac9de5dcbc28541fcf99f.tar.gz
Prepare for 1.1.0l-dev
Reviewed-by: Matt Caswell <matt@openssl.org>
-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 643200a5d5..cb82dba9f2 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.0k and 1.1.0l [xx XXX xxxx]
+
+ *)
+
Changes between 1.1.0j and 1.1.0k [28 May 2019]
*) Change the default RSA, DSA and DH size to 2048 bit instead of 1024.
diff --git a/NEWS b/NEWS
index da3293c980..a27090521b 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.0k and OpenSSL 1.1.0l [under development]
+
+ o
+
Major changes between OpenSSL 1.1.0j and OpenSSL 1.1.0k [28 May 2019]
o Prevent over long nonces in ChaCha20-Poly1305 (CVE-2019-1543)
diff --git a/README b/README
index 861ae80779..b3dc2c313e 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.1.0k 28 May 2019
+ OpenSSL 1.1.0l-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 81b12f1f08..94cb908872 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 0x101000bfL
+# define OPENSSL_VERSION_NUMBER 0x101000c0L
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0k-fips 28 May 2019"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0l-fips-dev xx XXX xxxx"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0k 28 May 2019"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0l-dev xx XXX xxxx"
# endif
/*-