From: Matt Caswell Date: Tue, 16 Feb 2021 15:24:11 +0000 (+0000) Subject: Prepare for 1.1.1k-dev X-Git-Tag: OpenSSL_1_1_1k~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97149c8219189c1bb61d36bfcd511956caeb4771;p=thirdparty%2Fopenssl.git Prepare for 1.1.1k-dev Reviewed-by: Richard Levitte --- diff --git a/CHANGES b/CHANGES index 1ab64b35c9a..8c2b701311d 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.1j and 1.1.1k [xx XXX xxxx] + + *) + Changes between 1.1.1i and 1.1.1j [16 Feb 2021] *) Fixed the X509_issuer_and_serial_hash() function. It attempts to diff --git a/NEWS b/NEWS index 3cce5250664..7e1cdf94e04 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.1j and OpenSSL 1.1.1k [under development] + + o + Major changes between OpenSSL 1.1.1i and OpenSSL 1.1.1j [16 Feb 2021] o Fixed a NULL pointer deref in the X509_issuer_and_serial_hash() diff --git a/README b/README index da5629f92c8..98ad8a356aa 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1j 16 Feb 2021 + OpenSSL 1.1.1k-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 cd5c23217a5..48c54fe673f 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 0x101010afL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1j 16 Feb 2021" +# define OPENSSL_VERSION_NUMBER 0x101010b0L +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1k-dev xx XXX xxxx" /*- * The macros below are to be used for shared library (.so, .dll, ...)