From: Bodo Möller <bodo@openssl.org>
Date: Tue, 8 Feb 2011 17:58:34 +0000 (+0000)
Subject: start 0.9.8s-dev
X-Git-Tag: OpenSSL_0_9_8s~65
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d430f56de6e585ee1ef0eee42cd7738ef27a2862;p=oweals%2Fopenssl.git

start 0.9.8s-dev
---

diff --git a/CHANGES b/CHANGES
index a0442b5306..43299af8ec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,13 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 0.9.8r and 0.9.8s [xx XXX xxxx]
+
+  *)
+
  Changes between 0.9.8q and 0.9.8r [8 Feb 2011]
 
-  *) Fix parsing of OCSP stapling ClientHello extension.  CVE-2011-0014
+  *) Fix parsing of OCSP stapling ClientHello extension. CVE-2011-0014
      [Neel Mehta, Adam Langley, Bodo Moeller (Google)]
 
   *) Fix bug in string printing code: if *any* escaping is enabled we must
diff --git a/README b/README
index 3438b40da5..4210c74284 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 0.9.8r
+ OpenSSL 0.9.8s-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 385e1f6865..740fe08f37 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	0x0090812fL
+#define OPENSSL_VERSION_NUMBER	0x00908130L
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8r-fips 8 Feb 2011"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8s-fips-dev xx XXX xxxx"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8r 8 Feb 2011"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8s xx XXX xxxx"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 
diff --git a/openssl.spec b/openssl.spec
index 9b68b3e1a3..c7d9612e5c 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -2,7 +2,7 @@
 %define libmaj 0
 %define libmin 9
 %define librel 8
-%define librev r
+%define librev s
 Release: 1
 
 %define openssldir /var/ssl