From fc4e1ab4708a3eb87a107df7e085d0d8125c5171 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 11 Sep 2018 13:49:46 +0100 Subject: [PATCH 1/1] Prepare for 1.1.1a-dev Reviewed-by: Richard Levitte --- CHANGES | 4 ++++ NEWS | 4 ++++ README | 2 +- include/openssl/opensslv.h | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 0d66a556b7..0499bd50d3 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.1 and 1.1.1a [xx XXX xxxx] + + *) + Changes between 1.1.0i and 1.1.1 [11 Sep 2018] *) Add a new ClientHello callback. Provides a callback interface that gives diff --git a/NEWS b/NEWS index 45c183c9b2..4026385dd7 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.1 and OpenSSL 1.1.1a [under development] + + o + Major changes between OpenSSL 1.1.0i and OpenSSL 1.1.1 [11 Sep 2018] o Support for TLSv1.3 added (see https://wiki.openssl.org/index.php/TLS1.3 diff --git a/README b/README index e70acb3139..5817b544a0 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1 11 Sep 2018 + OpenSSL 1.1.1a-dev Copyright (c) 1998-2018 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 9e66fc13fa..2a54f2c9c9 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 0x1010100fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1 11 Sep 2018" +# define OPENSSL_VERSION_NUMBER 0x10101010L +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a-dev xx XXX xxxx" /*- * The macros below are to be used for shared library (.so, .dll, ...) -- 2.34.1