diff options
author | Matt Caswell <matt@openssl.org> | 2019-09-10 14:17:46 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2019-09-10 14:17:46 +0100 |
commit | 4eabf3d6541e83ae4443384ca3c4cf516930bfd8 (patch) | |
tree | bfdf4ec469ec503298bb68a09c3a7a38a332ca31 | |
parent | 7ea5bd2b52d0e81eaef3d109b3b12545306f201c (diff) |
Prepare for 1.1.0m-dev
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | include/openssl/opensslv.h | 6 |
4 files changed, 12 insertions, 4 deletions
@@ -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 @@ -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 @@ -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 /*- |