From a4a90a8a3bdcb9336b5c9c15da419e99a87bc6ed Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 11 Sep 2018 16:23:22 +0200 Subject: [PATCH] The next version in master is at least 1.1.2, not 1.1.1x The OMC hasn't yet decided what the next release version will be, but it's at least going to 1.1.2, so we set that value for the moment. Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/7180) --- CHANGES | 2 +- NEWS | 2 +- README | 2 +- include/openssl/opensslv.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 0499bd50d3..abb03b4e4b 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.1 and 1.1.1a [xx XXX xxxx] + Changes between 1.1.1 and 1.1.2 [xx XXX xxxx] *) diff --git a/NEWS b/NEWS index 4026385dd7..3179b1dd24 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.1 and OpenSSL 1.1.1a [under development] + Major changes between OpenSSL 1.1.1 and OpenSSL 1.1.2 [under development] o diff --git a/README b/README index 5817b544a0..6818807a4c 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1a-dev + OpenSSL 1.1.2-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 2a54f2c9c9..f22601adcd 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 0x10101010L -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a-dev xx XXX xxxx" +# define OPENSSL_VERSION_NUMBER 0x10102000L +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.2-dev xx XXX xxxx" /*- * The macros below are to be used for shared library (.so, .dll, ...) -- 2.25.1