From: Matt Caswell Date: Tue, 10 Sep 2019 13:17:46 +0000 (+0100) Subject: Prepare for 1.1.0m-dev X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4eabf3d6541e83ae4443384ca3c4cf516930bfd8;p=oweals%2Fopenssl.git Prepare for 1.1.0m-dev Reviewed-by: Richard Levitte --- diff --git a/CHANGES b/CHANGES index 67ff19e5b5..58825db187 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.0l and 1.1.0m [xx XXX xxxx] + + *) + Changes between 1.1.0k and 1.1.0l [10 Sep 2019] *) For built-in EC curves, ensure an EC_GROUP built from the curve name is diff --git a/NEWS b/NEWS index 3c7e3c2e7c..3914bc3014 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.0l and OpenSSL 1.1.0m [under development] + + o + Major changes between OpenSSL 1.1.0k and OpenSSL 1.1.0l [10 Sep 2019] o Fixed a padding oracle in PKCS7_dataDecode and CMS_decrypt_set1_pkey diff --git a/README b/README index c3757f1c52..9ef3cf9ed5 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.0l 10 Sep 2019 + OpenSSL 1.1.0m-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 12483c6e1d..bd577f8943 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 0x101000cfL +# define OPENSSL_VERSION_NUMBER 0x101000d0L # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0l-fips 10 Sep 2019" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0m-fips-dev xx XXX xxxx" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0l 10 Sep 2019" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0m-dev xx XXX xxxx" # endif /*-