Prepare for 1.0.0s-dev

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/CHANGES b/CHANGES
index 409f129e6d377c48a9b8edd0e26d8d9e483c1c4b..7660a24127eb46ba423ff4cd364fe4da49ae7672 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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

diff --git a/NEWS b/NEWS
index 2cf99156d9b1f63e449142a8270d4a1eb5b9b244..e87b07f46e3c1b9161c407cba39445c4d766fa45 100644 (file)
--- 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.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)

diff --git a/README b/README
index 045c69b526fef4f88bd3d9247f40f162af9226e8..6a9fb12eeca75428c7b92c49d8ff066344869a0b 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- 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

diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 4299f8a4eddbc0ff37090d837f507b17cd943d7b..b5a8d275d5dfc84fe24e045529d06395baa250f0 100644 (file)
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -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
 

diff --git a/openssl.spec b/openssl.spec
index 272ed988ffd033f9f840e0bbd7cbb46db87ffa27..a85f0fefc6414d18f4ddc974c328d1994a165901 100644 (file)
--- 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.0r
+Version: 1.0.0s
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries