From 9e1eaa4a400633409322ed843ca63be799cad341 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 17 Mar 2020 14:32:46 +0000 Subject: [PATCH] Prepare for 1.1.1f-dev Reviewed-by: Paul Yang --- CHANGES | 4 ++++ NEWS | 4 ++++ README | 2 +- include/openssl/opensslv.h | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 0250e4ef02..2d1d13f7fb 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.1e and 1.1.1f [xx XXX xxxx] + + *) + Changes between 1.1.1d and 1.1.1e [17 Mar 2020] *) Properly detect EOF while reading in libssl. Previously if we hit an EOF while reading in libssl then we would report an error back to the diff --git a/NEWS b/NEWS index eba6c3b6d9..64722d5e92 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.1e and OpenSSL 1.1.1f [under development] + + o + Major changes between OpenSSL 1.1.1d and OpenSSL 1.1.1e [17 Mar 2020] o Fixed an overflow bug in the x64_64 Montgomery squaring procedure diff --git a/README b/README index 8e9ce75a33..01a6af9ec2 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1e 17 Mar 2020 + OpenSSL 1.1.1f-dev Copyright (c) 1998-2019 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 dd8ef3df72..4af9a41c75 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -39,8 +39,8 @@ 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 0x1010105fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1e 17 Mar 2020" +# define OPENSSL_VERSION_NUMBER 0x10101060L +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1f-dev xx XXX xxxx" /*- * The macros below are to be used for shared library (.so, .dll, ...) -- 2.25.1