From 1ec574ae25a754d88f810304be3bfcb7b23101a8 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 10 Nov 2016 14:04:49 +0000 Subject: [PATCH] Prepare for 1.1.0d-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 06cfbb25f2..e8b890d490 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ OpenSSL CHANGES _______________ + Changes between 1.1.0c and 1.1.0d [xx XXX xxxx] + + *) + Changes between 1.1.0b and 1.1.0c [10 Nov 2016] *) ChaCha20/Poly1305 heap-buffer-overflow diff --git a/NEWS b/NEWS index 979cb05373..929794e5c0 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.0c and OpenSSL 1.1.0d [under development] + + o + Major changes between OpenSSL 1.1.0b and OpenSSL 1.1.0c [10 Nov 2016] o ChaCha20/Poly1305 heap-buffer-overflow (CVE-2016-7054) diff --git a/README b/README index 6e448cf6d8..d38999fc5d 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.0c 10 Nov 2016 + OpenSSL 1.1.0d-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 2d54b69b69..660408c86a 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 0x1010003fL +# define OPENSSL_VERSION_NUMBER 0x10100040L # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0c-fips 10 Nov 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0d-fips-dev xx XXX xxxx" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0c 10 Nov 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0d-dev xx XXX xxxx" # endif /*- -- 2.25.1