diff options
| author | Matt Caswell <matt@openssl.org> | 2017-02-16 11:59:36 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-02-16 11:59:36 +0000 |
| commit | ffb1e659b2546cb704ef56ae01176b9062ef1c6f (patch) | |
| tree | 17684c2b17d69e62011bfe7962e732eb11204cc7 | |
| parent | 0453163e9a9052884cce288ff3e2acb77725a239 (diff) | |
Prepare for 1.1.0f-dev
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | include/openssl/opensslv.h | 6 |
4 files changed, 12 insertions, 4 deletions
@@ -2,6 +2,10 @@ OpenSSL CHANGES _______________ + Changes between 1.1.0e and 1.1.0f [xx XXX xxxx] + + *) + Changes between 1.1.0d and 1.1.0e [16 Feb 2017] *) Encrypt-Then-Mac renegotiation crash @@ -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.0e and OpenSSL 1.1.0f [under development] + + o + Major changes between OpenSSL 1.1.0d and OpenSSL 1.1.0e [16 Feb 2017] o Encrypt-Then-Mac renegotiation crash (CVE-2017-3733) @@ -1,5 +1,5 @@ - OpenSSL 1.1.0e 16 Feb 2017 + OpenSSL 1.1.0f-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 9d6708fa8b..cffeb01eaf 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 0x1010005fL +# define OPENSSL_VERSION_NUMBER 0x10100060L # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e-fips 16 Feb 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0f-fips-dev xx XXX xxxx" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e 16 Feb 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0f-dev xx XXX xxxx" # endif /*- |