From: Matt Caswell Date: Thu, 11 Jun 2015 13:59:37 +0000 (+0100) Subject: Prepare for 1.0.2c-dev X-Git-Tag: OpenSSL_1_0_2c~4 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b6ed9917314145d1133a3d571daa06f7d2fb66d2;p=oweals%2Fopenssl.git Prepare for 1.0.2c-dev Reviewed-by: Stephen Henson --- diff --git a/CHANGES b/CHANGES index 84e076411b..2ec8b7b56e 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ OpenSSL CHANGES _______________ + Changes between 1.0.2b and 1.0.2c [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 e6147935b2..8750b03a1c 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.0.2b and OpenSSL 1.0.2c [under development] + + o + Major changes between OpenSSL 1.0.2a and OpenSSL 1.0.2b [11 Jun 2015] o Malformed ECParameters causes infinite loop (CVE-2015-1788) diff --git a/README b/README index 8de5c74d8e..0bd70debd0 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.2b 11 Jun 2015 + OpenSSL 1.0.2c-dev 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 e6f991cfb8..d6df194aa9 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 0x1000202fL +# define OPENSSL_VERSION_NUMBER 0x10002030L # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2b-fips 11 Jun 2015" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2c-fips-dev xx XXX xxxx" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2b 11 Jun 2015" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2c-dev xx XXX xxxx" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/openssl.spec b/openssl.spec index 01f06171cc..e6c7584330 100644 --- a/openssl.spec +++ b/openssl.spec @@ -6,7 +6,7 @@ Release: 1 Summary: Secure Sockets Layer and cryptography libraries and tools Name: openssl -Version: 1.0.2b +Version: 1.0.2c Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz License: OpenSSL Group: System Environment/Libraries