Prepare for 1.0.1m-dev

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

diff --git a/CHANGES b/CHANGES
index d4700d9d799e51557dbb057ec4f4a9e1c18fc112..d6233cb7bf0e5b204f10807cbe308e728000c2a1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.0.1l and 1.0.1m [xx XXX xxxx]
+
+  *)
+
  Changes between 1.0.1k and 1.0.1l [15 Jan 2015]
 
   *) Build fixes for the Windows and OpenVMS platforms

diff --git a/NEWS b/NEWS
index 4ff27753ea7d307771b6517ef963a71f9f1ef06f..e17516ed9e428e982a50e895294a17a5b9f9f234 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.1l and OpenSSL 1.0.1m [under development]
+
+      o
+
   Major changes between OpenSSL 1.0.1k and OpenSSL 1.0.1l [15 Jan 2015]
 
       o Build fixes for the Windows and OpenVMS platforms

diff --git a/README b/README
index ef7eec7a2b7c25d0646a7fc80f18796ba5754f6d..3c1d767bc530856dc547114faa56d621caaa685e 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.1l 15 Jan 2015
+ OpenSSL 1.0.1m-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 4a1df08f6c3069b686baa19af6a4ace975367b50..de47e0be1aab0b609d6ef0ec04e3f8b5d0deb4c1 100644 (file)
--- 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 0x100010cfL
+#define OPENSSL_VERSION_NUMBER 0x100010d0L
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.1l-fips 15 Jan 2015"
+#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.1m-fips-dev xx XXX xxxx"
 #else
-#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.1l 15 Jan 2015"
+#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.1m-dev xx XXX xxxx"
 #endif
 #define OPENSSL_VERSION_PTEXT  " part of " OPENSSL_VERSION_TEXT
 

diff --git a/openssl.spec b/openssl.spec
index 70cfc7da92465ee5acb7f68e3089f8eeea216493..40ac462c7ffba2e9df5b41a34dfe322081a2591e 100644 (file)
--- 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.1l
+Version: 1.0.1m
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries