Prepare for 1.0.0r-dev

Reviewed-by: Stephen Henson <steve@openssl.org>

diff --git a/CHANGES b/CHANGES
index f0b67e77c294467bc1a670cd8f3c03f1a91ad46c..f48a0023a4079ff114c01fc6e30a683a59c36117 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.0.0q and 1.0.0r [xx XXX xxxx]
+
+  *)
+
  Changes between 1.0.0p and 1.0.0q [15 Jan 2015]
 
   *) Build fixes for the Windows and OpenVMS platforms

diff --git a/NEWS b/NEWS
index d9d48f3dfd613bb1110d3ccbbee92151c522a691..448b24ac012696a1fae4dba9f77680f5bdac5c4f 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.0q and OpenSSL 1.0.0r [under development]
+
+      o
+
   Major changes between OpenSSL 1.0.0p and OpenSSL 1.0.0q [15 Jan 2015]
 
       o Build fixes for the Windows and OpenVMS platforms

diff --git a/README b/README
index dd0ae9deff8cad2a1ff7a83337ba1ef79b9ef475..4f67e9ec88bdb925b65db3fa71a622de754eafba 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.0q 15 Jan 2015
+ OpenSSL 1.0.0r-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 7c0a62f9ab26d9b554a730b9a8011a0a93be2610..7cd1fc4f971284a79b06b7d2a98414f859106282 100644 (file)
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER 0x1000011fL
+#define OPENSSL_VERSION_NUMBER 0x10000120L
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.0q-fips 15 Jan 2015"
+#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.0r-fips-dev xx XXX xxxx"
 #else
-#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.0q 15 Jan 2015"
+#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.0r-dev xx XXX xxxx"
 #endif
 #define OPENSSL_VERSION_PTEXT  " part of " OPENSSL_VERSION_TEXT
 

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