From ac2c44c6289f9716de4c4beeb284a818eacde517 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 22 Sep 2016 11:14:50 +0100 Subject: Prepare for 1.1.0a 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 9f2433d257..63c0ae418b 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,7 @@ OpenSSL CHANGES _______________ - Changes between 1.1.0 and 1.1.0a [xx XXX xxxx] + Changes between 1.1.0 and 1.1.0a [22 Sep 2016] *) OCSP Status Request extension unbounded memory growth diff --git a/NEWS b/NEWS index ce6a54fe63..88878baf55 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.0 and OpenSSL 1.1.0a [under development] + Major changes between OpenSSL 1.1.0 and OpenSSL 1.1.0a [22 Sep 2016] o OCSP Status Request extension unbounded memory growth (CVE-2016-6304) o SSL_peek() hang on empty record (CVE-2016-6305) diff --git a/README b/README index cac5fc6047..5bdeee7df4 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.0a-dev + OpenSSL 1.1.0a 22 Sep 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 0d9a89d877..bffaac1c38 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 0x10100010L +# define OPENSSL_VERSION_NUMBER 0x1010001fL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0a-fips-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0a-fips 22 Sep 2016" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0a-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0a 22 Sep 2016" # endif /*- -- cgit v1.2.3