From: Matt Caswell Date: Tue, 22 Sep 2020 12:55:17 +0000 (+0100) Subject: Prepare for 1.1.1i-dev X-Git-Tag: OpenSSL_1_1_1i~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F12950%2Fhead;p=thirdparty%2Fopenssl.git Prepare for 1.1.1i-dev Reviewed-by: Matthias St. Pierre --- diff --git a/CHANGES b/CHANGES index 7ea3d2b8232..fcb824c02d5 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.1h and 1.1.1i [xx XXX xxxx] + + *) + Changes between 1.1.1g and 1.1.1h [22 Sep 2020] *) Certificates with explicit curve parameters are now disallowed in diff --git a/NEWS b/NEWS index 5529a260e4e..0a9adf3e3d9 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.1h and OpenSSL 1.1.1i [under development] + + o + Major changes between OpenSSL 1.1.1g and OpenSSL 1.1.1h [22 Sep 2020] o Disallow explicit curve parameters in verifications chains when diff --git a/README b/README index 0bcce5b487c..8a44e9dbe55 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1h 22 Sep 2020 + OpenSSL 1.1.1i-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 7cf31d3625c..840450e67c7 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 0x1010108fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1h 22 Sep 2020" +# define OPENSSL_VERSION_NUMBER 0x10101090L +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1i-dev xx XXX xxxx" /*- * The macros below are to be used for shared library (.so, .dll, ...)