From: Matt Caswell Date: Thu, 25 Aug 2016 15:30:15 +0000 (+0100) Subject: Prepare for 1.1.0a-dev X-Git-Tag: OpenSSL_1_1_0a~111 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dcb36a995edc387a30bbd7dae4d0199db34557d1;p=oweals%2Fopenssl.git Prepare for 1.1.0a-dev Reviewed-by: Richard Levitte --- diff --git a/CHANGES b/CHANGES index 00ee4c4ad9..31f9c261e0 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ OpenSSL CHANGES _______________ + Changes between 1.1.0 and 1.1.0a [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 diff --git a/NEWS b/NEWS index d54479adf9..0792f31523 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.0 and OpenSSL 1.1.0a [under development] + + o + 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 diff --git a/README b/README index 3df03bcba0..cac5fc6047 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.0 25 Aug 2016 + OpenSSL 1.1.0a-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 2961655931..0d9a89d877 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 0x1010000fL +# define OPENSSL_VERSION_NUMBER 0x10100010L # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0-fips 25 Aug 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0a-fips-dev xx XXX xxxx" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0 25 Aug 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0a-dev xx XXX xxxx" # endif /*-