Commit e356ac5c authored by Matt Caswell's avatar Matt Caswell
Browse files

Prepare for 1.0.1k-dev 



Reviewed-by: default avatarStephen Henson <steve@openssl.org>
parent 872e681c

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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.

NEWS

+4 −0
Original line number Diff line number Diff line
@@ -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

README

+1 −1
Original line number Diff line number Diff line 


 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

crypto/opensslv.h

+3 −3
Original line number Diff line number Diff line
@@ -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

openssl.spec

+1 −1
Original line number Diff line number Diff line
@@ -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