From a12778be1782bb63055e7641c814d4fce1775e57 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 26 Sep 2016 10:46:58 +0100 Subject: [PATCH] Prepare for 1.1.0c-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 311471e8dd..3781d0626b 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ OpenSSL CHANGES _______________ + Changes between 1.1.0b and 1.1.0c [xx XXX xxxx] + + *) + Changes between 1.1.0a and 1.1.0b [26 Sep 2016] *) Fix Use After Free for large message sizes diff --git a/NEWS b/NEWS index 7e8a57a448..81315becfd 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.0b and OpenSSL 1.1.0c [under development] + + o + Major changes between OpenSSL 1.1.0a and OpenSSL 1.1.0b [26 Sep 2016] o Fix Use After Free for large message sizes (CVE-2016-6309) diff --git a/README b/README index f87772449d..8ca5eb40fa 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.0b 26 Sep 2016 + OpenSSL 1.1.0c-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 7b376a3e06..4792f69978 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 0x1010002fL +# define OPENSSL_VERSION_NUMBER 0x10100030L # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0b-fips 26 Sep 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0c-fips-dev xx XXX xxxx" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0b 26 Sep 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0c-dev xx XXX xxxx" # endif /*- -- 2.25.1