Commit 06cf4418 authored by Matt Caswell's avatar Matt Caswell
Browse files

Prepare for 1.0.0s-dev 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 81741de6

CHANGES

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

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.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)

README

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


 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

crypto/opensslv.h

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

openssl.spec

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