From d4e4bd2a8163f355fa8a3884077eaec7adc75ff7 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 27 Mar 2018 14:50:36 +0100 Subject: Prepare for 1.1.0h release Reviewed-by: Richard Levitte --- CHANGES | 2 +- NEWS | 2 +- README | 2 +- include/openssl/opensslv.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index d3051bc6fc..0ea1ad555f 100644 --- a/CHANGES +++ b/CHANGES @@ -7,7 +7,7 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. - Changes between 1.1.0g and 1.1.0h [xx XXX xxxx] + Changes between 1.1.0g and 1.1.0h [27 Mar 2018] *) Constructed ASN.1 types with a recursive definition could exceed the stack diff --git a/NEWS b/NEWS index b077b594db..8744fe68ec 100644 --- a/NEWS +++ b/NEWS @@ -5,7 +5,7 @@ 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.0g and OpenSSL 1.1.0h [under development] + Major changes between OpenSSL 1.1.0g and OpenSSL 1.1.0h [27 Mar 2018] o Constructed ASN.1 types with a recursive definition could exceed the stack (CVE-2018-0739) diff --git a/README b/README index ae5e5e71be..3491280ead 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.0h-dev + OpenSSL 1.1.0h 27 Mar 2018 Copyright (c) 1998-2016 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 f555196756..4fb437f2ee 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 0x10100080L +# define OPENSSL_VERSION_NUMBER 0x1010008fL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h-fips-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h-fips 27 Mar 2018" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h 27 Mar 2018" # endif #define OPENSSL_MAKE_VERSION(maj,min,fix,patch) ((0x10000000L)+((maj&0xff)<<20)+((min&0xff)<<12)+((fix&0xff)<<4)+patch) -- cgit v1.2.3