From: Matt Caswell Date: Thu, 11 Jun 2015 14:05:11 +0000 (+0100) Subject: Prepare for 1.0.1n release X-Git-Tag: OpenSSL_1_0_1n X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=42c2a7f2c7173883f008a9678444cbafe2032cf8;p=oweals%2Fopenssl.git Prepare for 1.0.1n release Reviewed-by: Stephen Henson --- diff --git a/CHANGES b/CHANGES index a985c66379..2565187204 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,7 @@ OpenSSL CHANGES _______________ - Changes between 1.0.1m and 1.0.1n [xx XXX xxxx] + Changes between 1.0.1m and 1.0.1n [11 Jun 2015] *) Malformed ECParameters causes infinite loop diff --git a/NEWS b/NEWS index 0e849d4832..e866e94fa6 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.1m and OpenSSL 1.0.1n [under development] + Major changes between OpenSSL 1.0.1m and OpenSSL 1.0.1n [11 Jun 2015] o Malformed ECParameters causes infinite loop (CVE-2015-1788) o Exploitable out-of-bounds read in X509_cmp_time (CVE-2015-1789) diff --git a/README b/README index caddc935d6..8718a24346 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.1n-dev + OpenSSL 1.0.1n 11 Jun 2015 Copyright (c) 1998-2011 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/crypto/opensslv.h b/crypto/opensslv.h index d40d5da8a2..94a95f3482 100644 --- a/crypto/opensslv.h +++ b/crypto/opensslv.h @@ -30,11 +30,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 0x100010e0L +# define OPENSSL_VERSION_NUMBER 0x100010efL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1n-fips-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1n-fips 11 Jun 2015" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1n-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1n 11 Jun 2015" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT