Prepare for 1.0.1o-dev

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

diff --git a/CHANGES b/CHANGES
index 256518720428f098bcd06a6bd8f628bcaae88321..06601b41e1cce7072fe87f7ca80fb166fc29feb7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.0.1n and 1.0.1o [xx XXX xxxx]
+
+  *)
+
  Changes between 1.0.1m and 1.0.1n [11 Jun 2015]
 
   *) Malformed ECParameters causes infinite loop

diff --git a/NEWS b/NEWS
index e866e94fa676880a9cc1b17b65616360cb79a4e1..286059cb3562e3c7624320f0b1191420063bc07c 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.1n and OpenSSL 1.0.1o [under development]
+
+      o
+
   Major changes between OpenSSL 1.0.1m and OpenSSL 1.0.1n [11 Jun 2015]
 
       o Malformed ECParameters causes infinite loop (CVE-2015-1788)

diff --git a/README b/README
index 8718a24346ed30ee53176a01bcd4d1b254b54eab..d379b0387cbf78828bbe4a36290df5378faf7b6f 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.1n 11 Jun 2015
+ OpenSSL 1.0.1o-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 94a95f348237ade9e4ae8c85d8d61e2d05f39e3e..14bc8bdba36bd2580545329bb4a3cba108642987 100644 (file)
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -30,11 +30,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  0x100010efL
+# define OPENSSL_VERSION_NUMBER  0x100010f0L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1n-fips 11 Jun 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1o-fips-dev xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1n 11 Jun 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1o-dev xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 

diff --git a/openssl.spec b/openssl.spec
index 71e907e28e382ca35dedda679e9f11d915ddd56d..3e8f3a9d6208ac38acf7de4ad62d52088cc12cd4 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.1n
+Version: 1.0.1o
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries