From: Matt Caswell Date: Wed, 15 Oct 2014 12:55:20 +0000 (+0100) Subject: Prepare for 1.0.1k-dev X-Git-Tag: OpenSSL_1_0_1k~115 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e356ac5c0699d49d13bc593d24d3fdf47586a7da;p=oweals%2Fopenssl.git Prepare for 1.0.1k-dev Reviewed-by: Stephen Henson --- diff --git a/CHANGES b/CHANGES index 277b46f17c..c20b873489 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ OpenSSL CHANGES _______________ + Changes between 1.0.1j and 1.0.1k [xx XXX xxxx] + + *) + Changes between 1.0.1i and 1.0.1j [15 Oct 2014] *) SRTP Memory Leak. diff --git a/NEWS b/NEWS index 512a667ff4..23b28eb0d6 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.1j and OpenSSL 1.0.1k [under development] + + o + Major changes between OpenSSL 1.0.1i and OpenSSL 1.0.1j [15 Oct 2014] o Fix for CVE-2014-3513 diff --git a/README b/README index cb90c9f402..734e1f8994 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.1j 15 Oct 2014 + OpenSSL 1.0.1k-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 f375967ef9..adba89b1ee 100644 --- a/crypto/opensslv.h +++ b/crypto/opensslv.h @@ -29,11 +29,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 0x100010afL +#define OPENSSL_VERSION_NUMBER 0x100010b0L #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1j-fips 15 Oct 2014" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1k-fips-dev xx XXX xxxx" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1j 15 Oct 2014" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1k-dev xx XXX xxxx" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/openssl.spec b/openssl.spec index 706fb5d239..707dd2c578 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.1j +Version: 1.0.1k Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz License: OpenSSL Group: System Environment/Libraries