From: Matt Caswell <matt@openssl.org>
Date: Thu, 11 Jun 2015 14:23:16 +0000 (+0100)
Subject: Prepare for 0.9.8zh-dev
X-Git-Tag: OpenSSL_0_9_8zh~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c9dfa18aacdd22537ced0815d0a53532c019d5b;p=oweals%2Fopenssl.git

Prepare for 0.9.8zh-dev

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

diff --git a/CHANGES b/CHANGES
index 718071229c..ed2f0ecff3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 0.9.8zg and 0.9.8zh [xx XXX xxxx]
+
+  *)
+
  Changes between 0.9.8zf and 0.9.8zg [11 Jun 2015]
 
   *) Malformed ECParameters causes infinite loop
diff --git a/NEWS b/NEWS
index 348c3bf61d..4ffbbab0cd 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 0.9.8zg and OpenSSL 0.9.8zh [under development]
+
+      o
+
   Major changes between OpenSSL 0.9.8zf and OpenSSL 0.9.8zg [11 Jun 2015]
 
       o Malformed ECParameters causes infinite loop (CVE-2015-1788)
diff --git a/README b/README
index 681889c80c..5ca30cf88b 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 0.9.8zg 11 Jun 2015
+ OpenSSL 0.9.8zh-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 058711bf54..9aadf3ec51 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -26,11 +26,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x0090820fL
+# define OPENSSL_VERSION_NUMBER  0x00908210L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 0.9.8zg-fips 11 Jun 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 0.9.8zh-fips-dev xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 0.9.8zg 11 Jun 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 0.9.8zh-dev xx XXX xxxx"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/openssl.spec b/openssl.spec
index ff48b84654..12e070574a 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: 0.9.8zg
+Version: 0.9.8zh
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries