From: Matt Caswell Date: Thu, 11 Jun 2015 13:55:38 +0000 (+0100) Subject: Prepare for 1.0.2b release X-Git-Tag: OpenSSL_1_0_2b^0 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7b560c174dcd569795f5be66e0c091d1be440614;p=oweals%2Fopenssl.git Prepare for 1.0.2b release Reviewed-by: Stephen Henson --- diff --git a/CHANGES b/CHANGES index 21a3b70101..84e076411b 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,7 @@ OpenSSL CHANGES _______________ - Changes between 1.0.2a and 1.0.2b [xx XXX xxxx] + Changes between 1.0.2a and 1.0.2b [11 Jun 2015] *) Malformed ECParameters causes infinite loop diff --git a/NEWS b/NEWS index beb2dd3d86..e6147935b2 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.2a and OpenSSL 1.0.2b [under development] + Major changes between OpenSSL 1.0.2a and OpenSSL 1.0.2b [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 ad27d986ae..8de5c74d8e 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.2b-dev + OpenSSL 1.0.2b 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 654f72dc8c..e6f991cfb8 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 0x10002020L +# define OPENSSL_VERSION_NUMBER 0x1000202fL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2b-fips-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2b-fips 11 Jun 2015" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2b-dev xx XXX xxxx" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2b 11 Jun 2015" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT