Prepare for 1.1.0m-dev

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2019-09-10 14:17:46 +01:00
parent 7ea5bd2b52
commit 4eabf3d654
4 changed files with 12 additions and 4 deletions

View File

@ -7,6 +7,10 @@
https://github.com/openssl/openssl/commits/ and pick the appropriate https://github.com/openssl/openssl/commits/ and pick the appropriate
release branch. 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] 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 *) For built-in EC curves, ensure an EC_GROUP built from the curve name is

4
NEWS
View File

@ -5,6 +5,10 @@
This file gives a brief overview of the major changes between each OpenSSL This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file. 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] 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 o Fixed a padding oracle in PKCS7_dataDecode and CMS_decrypt_set1_pkey

2
README
View File

@ -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) 1998-2019 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

View File

@ -39,11 +39,11 @@ extern "C" {
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta) * major minor fix final patch/beta)
*/ */
# define OPENSSL_VERSION_NUMBER 0x101000cfL # define OPENSSL_VERSION_NUMBER 0x101000d0L
# ifdef OPENSSL_FIPS # 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 # 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 # endif
/*- /*-