From cf3685393faa33496e447326069e83bd6bac6522 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 8 Dec 2020 13:21:09 +0000 Subject: [PATCH] Prepare for 1.1.1j-dev Reviewed-by: Richard Levitte --- 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 37dd60b726e..75b9cec4b1a 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.1i and 1.1.1j [xx XXX xxxx] + + *) + Changes between 1.1.1h and 1.1.1i [8 Dec 2020] *) Fixed NULL pointer deref in the GENERAL_NAME_cmp function diff --git a/NEWS b/NEWS index 98f6791a8b7..55ffce8ea39 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.1i and OpenSSL 1.1.1j [under development] + + o + Major changes between OpenSSL 1.1.1h and OpenSSL 1.1.1i [8 Dec 2020] o Fixed NULL pointer deref in GENERAL_NAME_cmp (CVE-2020-1971) diff --git a/README b/README index 6325127b569..d52dcf1bc51 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1i 8 Dec 2020 + OpenSSL 1.1.1j-dev Copyright (c) 1998-2020 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 f5d660a467b..e91b43bffee 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 0x1010109fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1i 8 Dec 2020" +# define OPENSSL_VERSION_NUMBER 0x101010a0L +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1j-dev xx XXX xxxx" /*- * The macros below are to be used for shared library (.so, .dll, ...) -- 2.47.2