From: Matt Caswell <matt@openssl.org>
Date: Wed, 6 Aug 2014 21:25:27 +0000 (+0100)
Subject: Prepare for 1.0.0o-dev
X-Git-Tag: OpenSSL_1_0_0o~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=118149887b5cceb66b381b7d26ff55cc447cc08c;p=oweals%2Fopenssl.git

Prepare for 1.0.0o-dev

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

diff --git a/CHANGES b/CHANGES
index 717952b285..893a60575d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.0.0n and 1.0.0o [xx XXX xxxx]
+
+  *)
+
  Changes between 1.0.0m and 1.0.0n [6 Aug 2014]
 
   *) OpenSSL DTLS clients enabling anonymous (EC)DH ciphersuites are subject
diff --git a/NEWS b/NEWS
index e5f2f02595..ade7951bed 100644
--- 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.0n and OpenSSL 1.0.0o [under development]
+
+      o
+
   Major changes between OpenSSL 1.0.0m and OpenSSL 1.0.0n [6 Aug 2014]
 
       o Fix for CVE-2014-3510
diff --git a/README b/README
index 94e3a012b3..32734c7e9b 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.0n 6 Aug 2014
+ OpenSSL 1.0.0o-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 209897dc0e..78e88b10e4 100644
--- 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	0x100000efL
+#define OPENSSL_VERSION_NUMBER	0x100000f0L
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0n-fips 6 Aug 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0o-fips-dev xx XXX xxxx"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0n 6 Aug 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0o-dev xx XXX xxxx"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 
diff --git a/openssl.spec b/openssl.spec
index eac1a0f23a..42ce3e0a06 100644
--- 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.0n
+Version: 1.0.0o
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries