From fa7130eb6832bcdccb335dd0f6bb535fe9a3e868 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 26 Jan 2017 13:11:26 +0000 Subject: [PATCH] Prepare for 1.1.0e-dev Reviewed-by: Richard Levitte --- CHANGES | 4 ++++ NEWS | 4 ++++ README | 2 +- include/openssl/opensslv.h | 6 +++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 63d7b2b4c3..d516e2cb25 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ OpenSSL CHANGES _______________ + Changes between 1.1.0d and 1.1.0e [xx XXX xxxx] + + *) + Changes between 1.1.0c and 1.1.0d [26 Jan 2017] *) Truncated packet could crash via OOB read diff --git a/NEWS b/NEWS index b73da74bb4..693bbecfc2 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.0d and OpenSSL 1.1.0e [under development] + + o + Major changes between OpenSSL 1.1.0c and OpenSSL 1.1.0d [26 Jan 2017] o Truncated packet could crash via OOB read (CVE-2017-3731) diff --git a/README b/README index 36e468a07c..03ad75c94f 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.0d 26 Jan 2017 + OpenSSL 1.1.0e-dev 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 445f6fa875..098c9576af 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 0x1010004fL +# define OPENSSL_VERSION_NUMBER 0x10100050L # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0d-fips 26 Jan 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e-fips-dev xx XXX xxxx" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0d 26 Jan 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e-dev xx XXX xxxx" # endif /*- -- 2.25.1