From: Matt Caswell Date: Tue, 21 Apr 2020 12:24:21 +0000 (+0100) Subject: Prepare for 1.1.1h-dev X-Git-Tag: OpenSSL_1_1_1h~116 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49d391d03c11352eeadec7df39c48d1c83fb164e;p=thirdparty%2Fopenssl.git Prepare for 1.1.1h-dev Reviewed-by: Richard Levitte --- diff --git a/CHANGES b/CHANGES index 057405b0bff..228408d9f05 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.1g and 1.1.1h [xx XXX xxxx] + + *) + Changes between 1.1.1f and 1.1.1g [21 Apr 2020] *) Fixed segmentation fault in SSL_check_chain() diff --git a/NEWS b/NEWS index 455b02dcb26..fc8ff7371a6 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.1g and OpenSSL 1.1.1h [under development] + + o + Major changes between OpenSSL 1.1.1f and OpenSSL 1.1.1g [21 Apr 2020] o Fixed segmentation fault in SSL_check_chain() (CVE-2020-1967) diff --git a/README b/README index 46c2b537bed..c7bf50c5205 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1g 21 Apr 2020 + OpenSSL 1.1.1h-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 17d271f54c7..e6b5825b81f 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 0x1010107fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1g 21 Apr 2020" +# define OPENSSL_VERSION_NUMBER 0x10101080L +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1h-dev xx XXX xxxx" /*- * The macros below are to be used for shared library (.so, .dll, ...)