From: Matt Caswell Date: Thu, 22 Jan 2015 16:16:24 +0000 (+0000) Subject: Prepare for 1.0.2a-dev X-Git-Tag: OpenSSL_1_0_2a~105 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=06aab26874279547da6e2c877ad84c849fcb8ac0;p=oweals%2Fopenssl.git Prepare for 1.0.2a-dev Reviewed-by: Stephen Henson --- diff --git a/CHANGES b/CHANGES index b5b3dd20f5..c1a07d7336 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ OpenSSL CHANGES _______________ + Changes between 1.0.2 and 1.0.2a [xx XXX xxxx] + + *) + Changes between 1.0.1l and 1.0.2 [22 Jan 2015] *) SRTP Memory Leak. diff --git a/NEWS b/NEWS index 35f3e3f717..41e5bdb5f4 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.2 and OpenSSL 1.0.2a [under development] + + o + Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.2 [22 Jan 2015]: o Suite B support for TLS 1.2 and DTLS 1.2 diff --git a/README b/README index 7878f38e6e..89b7ac37bf 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.2 22 Jan 2015 + OpenSSL 1.0.2a-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 e277caee89..f0a9432ece 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 0x1000200fL +# define OPENSSL_VERSION_NUMBER 0x10002010L # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2-fips 22 Jan 2015" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2a-fips-dev xx XXX xxxx" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2 22 Jan 2015" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2a-dev xx XXX xxxx" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/openssl.spec b/openssl.spec index c90dc69a4c..909f2bfabf 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.2 +Version: 1.0.2a Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz License: OpenSSL Group: System Environment/Libraries