From 06cf4418cf45253afe401fd4270effd439103dca Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 19 Mar 2015 13:45:41 +0000 Subject: [PATCH] Prepare for 1.0.0s-dev Reviewed-by: Richard Levitte --- CHANGES | 4 ++++ NEWS | 4 ++++ README | 2 +- crypto/opensslv.h | 6 +++--- openssl.spec | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 409f129e6d..7660a24127 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ OpenSSL CHANGES _______________ + Changes between 1.0.0r and 1.0.0s [xx XXX xxxx] + + *) + Changes between 1.0.0q and 1.0.0r [19 Mar 2015] *) Segmentation fault in ASN1_TYPE_cmp fix diff --git a/NEWS b/NEWS index 2cf99156d9..e87b07f46e 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.0r and OpenSSL 1.0.0s [under development] + + o + Major changes between OpenSSL 1.0.0q and OpenSSL 1.0.0r [19 Mar 2015] o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286) diff --git a/README b/README index 045c69b526..6a9fb12eec 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.0r 19 Mar 2015 + OpenSSL 1.0.0s-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 4299f8a4ed..b5a8d275d5 100644 --- a/crypto/opensslv.h +++ b/crypto/opensslv.h @@ -26,11 +26,11 @@ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x1000012fL +# define OPENSSL_VERSION_NUMBER 0x10000130L # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0r-fips 19 Mar 2015" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0s-fips-dev xx XXX xxxx" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0r 19 Mar 2015" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0s-dev xx XXX xxxx" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/openssl.spec b/openssl.spec index 272ed988ff..a85f0fefc6 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.0r +Version: 1.0.0s Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz License: OpenSSL Group: System Environment/Libraries -- 2.25.1