From: Matt Caswell <matt@openssl.org>
Date: Thu, 9 Jul 2015 12:18:51 +0000 (+0100)
Subject: Prepare for 1.0.2e-dev
X-Git-Tag: OpenSSL_1_0_2e~170
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a7ef1e907276a899fbfeee642810caccb03fc07c;p=oweals%2Fopenssl.git

Prepare for 1.0.2e-dev

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

diff --git a/CHANGES b/CHANGES
index 5d4c234363..11ef03ebf7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.0.2d and 1.0.2e [xx XXX xxxx]
+
+  *)
+
  Changes between 1.0.2c and 1.0.2d [9 Jul 2015]
 
   *) Alternate chains certificate forgery
diff --git a/NEWS b/NEWS
index 29e48053ef..cb5674b391 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.2d and OpenSSL 1.0.2e [under development]
+
+      o
+
   Major changes between OpenSSL 1.0.2c and OpenSSL 1.0.2d [9 Jul 2015]
 
       o Alternate chains certificate forgery (CVE-2015-1793)
diff --git a/README b/README
index 493141b69c..ae17fb41c2 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.2d 9 Jul 2015
+ OpenSSL 1.0.2e-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 c06b13ac6b..faaf63f4fb 100644
--- 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  0x1000204fL
+# define OPENSSL_VERSION_NUMBER  0x10002050L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2d-fips 9 Jul 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2e-fips-dev xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2d 9 Jul 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2e-dev xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/openssl.spec b/openssl.spec
index b721d65729..45e737ad15 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.2d
+Version: 1.0.2e
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries