From: Matt Caswell Date: Tue, 31 Mar 2020 12:19:19 +0000 (+0100) Subject: Prepare for 1.1.1g-dev X-Git-Tag: OpenSSL_1_1_1g~26 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce843e36d65e22e5681e8b81301f1ebd045c3109;p=oweals%2Fopenssl.git Prepare for 1.1.1g-dev Reviewed-by: Richard Levitte --- diff --git a/CHANGES b/CHANGES index f4230aaac0..5a4c77cca6 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.1f and 1.1.1g [xx XXX xxxx] + + *) + Changes between 1.1.1e and 1.1.1f [31 Mar 2020] *) Revert the change of EOF detection while reading in libssl to avoid diff --git a/NEWS b/NEWS index 85470793b2..79202c3af2 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.1f and OpenSSL 1.1.1g [under development] + + o + Major changes between OpenSSL 1.1.1e and OpenSSL 1.1.1f [31 Mar 2020] o Revert the unexpected EOF reporting via SSL_ERROR_SSL diff --git a/README b/README index d7d44aa3a0..2fa731e0a9 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1f 31 Mar 2020 + OpenSSL 1.1.1g-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 8c697f5f7a..3e4c167af1 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 0x1010106fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1f 31 Mar 2020" +# define OPENSSL_VERSION_NUMBER 0x10101070L +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1g-dev xx XXX xxxx" /*- * The macros below are to be used for shared library (.so, .dll, ...)