From abd30777cc72029e8a44e4b67201cae8ed3d19c1 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 25 Aug 2016 16:29:18 +0100 Subject: [PATCH] Prepare for 1.1.0 release Reviewed-by: Richard Levitte --- CHANGES | 2 +- NEWS | 2 +- README | 2 +- include/openssl/opensslv.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index a5796ac75b..00ee4c4ad9 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,7 @@ OpenSSL CHANGES _______________ - Changes between 1.0.2h and 1.1.0 [xx XXX xxxx] + Changes between 1.0.2h and 1.1.0 [25 Aug 2016] *) Windows command-line tool supports UTF-8 opt-in option for arguments and console input. Setting OPENSSL_WIN32_UTF8 environment variable diff --git a/NEWS b/NEWS index 9a46c67fcf..d54479adf9 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.0.2h and OpenSSL 1.1.0 [in pre-release] + Major changes between OpenSSL 1.0.2h and OpenSSL 1.1.0 [25 Aug 2016] o Copyright text was shrunk to a boilerplate that points to the license o "shared" builds are now the default when possible diff --git a/README b/README index a4026ef3eb..3df03bcba0 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.0-pre7-dev + OpenSSL 1.1.0 25 Aug 2016 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 1abd522b7b..2961655931 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 0x10100007L +# define OPENSSL_VERSION_NUMBER 0x1010000fL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0-pre7-fips-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0-fips 25 Aug 2016" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0-pre7-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0 25 Aug 2016" # endif /*- -- 2.25.1