From: Matt Caswell Date: Fri, 12 Jun 2015 15:24:26 +0000 (+0100) Subject: Prepare for 1.0.1p-dev X-Git-Tag: OpenSSL_1_0_1p~25 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=902795b2f19c8ed91aa13ad471526b0c3f5c674b;p=oweals%2Fopenssl.git Prepare for 1.0.1p-dev Reviewed-by: Richard Levitte --- diff --git a/CHANGES b/CHANGES index 759b2a7bba..af27f3fdf5 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ OpenSSL CHANGES _______________ + Changes between 1.0.1o and 1.0.1p [xx XXX xxxx] + + *) + Changes between 1.0.1n and 1.0.1o [12 Jun 2015] *) Fix HMAC ABI incompatibility. The previous version introduced an ABI diff --git a/NEWS b/NEWS index fb69ad3e5d..1d81d4ccf3 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.1o and OpenSSL 1.0.1p [under development] + + o + Major changes between OpenSSL 1.0.1n and OpenSSL 1.0.1o [12 Jun 2015] o Fix HMAC ABI incompatibility diff --git a/README b/README index bf3b71540d..7b9ff6e695 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.1o 12 Jun 2015 + OpenSSL 1.0.1p-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 84d0bf9d1f..f86e324bb0 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 0x100010ffL +# define OPENSSL_VERSION_NUMBER 0x10001100L # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1o-fips 12 Jun 2015" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1p-fips-dev xx XXX xxxx" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1o 12 Jun 2015" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1p-dev xx XXX xxxx" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/openssl.spec b/openssl.spec index 3e8f3a9d62..67a6074a8f 100644 --- a/openssl.spec +++ b/openssl.spec @@ -7,7 +7,7 @@ Release: 1 Summary: Secure Sockets Layer and cryptography libraries and tools Name: openssl #Version: %{libmaj}.%{libmin}.%{librel} -Version: 1.0.1o +Version: 1.0.1p Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz License: OpenSSL Group: System Environment/Libraries