From 8b8a2928afd00447b0f0e5942f93b61eb636e5e8 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Wed, 20 Jan 2010 17:26:02 +0000
Subject: [PATCH] prepare for release

---
 CHANGES           |  2 +-
 NEWS              | 14 ++++++++++++++
 README            |  2 +-
 STATUS            |  6 ++++--
 crypto/opensslv.h |  6 +++---
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5e71187a7c..3fa0adf5fe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 0.9.8l (?) and 0.9.8m (?)  [xx XXX xxxx]
+ Changes between 0.9.8l and 0.9.8m [xx XXX xxxx]
 
   *) Handle TLS versions 2.0 and later properly and correctly use the
      highest version of TLS/SSL supported. Although TLS >= 2.0 is some way
diff --git a/NEWS b/NEWS
index 37156fc593..23939b603b 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,20 @@
   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.8l and OpenSSL 0.9.8m-beta1:
+
+      o Remove MD2 from algorithm tables.
+      o SPKAC handling fixes.
+      o Implement draft-ietf-tls-renegotiation-03.
+      o Compression memory leak fixed.
+      o Compression session resumption fixed.
+      o Ticket and SNI coexistence fixes.
+      o Many fixes to DTLS handling. 
+
+  Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l:
+
+      o Temporary work around for CVE-2009-3555: disable renegotiation.
+
   Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k:
 
       o Fix various build issues.
diff --git a/README b/README
index b428a5da4c..a4f8bce636 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 0.9.8k
+ OpenSSL 0.9.8m-beta1
 
  Copyright (c) 1998-2009 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/STATUS b/STATUS
index 196814064f..3fbf2b968e 100644
--- a/STATUS
+++ b/STATUS
@@ -1,10 +1,12 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2009/03/25 10:46:55 $
+  ______________                           $Date: 2010/01/20 17:26:01 $
 
   DEVELOPMENT STATE
 
-    o  OpenSSL 0.9.9:  Under development...
+    o  OpenSSL 1.0.0:  Under development...
+    o  OpenSSL 0.9.8m-beta1: Released on January 20th, 2010
+    o  OpenSSL 0.9.8l: Released on November   5th, 2009
     o  OpenSSL 0.9.8k: Released on March     25th, 2009
     o  OpenSSL 0.9.8j: Released on January    7th, 2009
     o  OpenSSL 0.9.8i: Released on September 15th, 2008
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index c06bf3b45c..23a8583dc7 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	0x009080c0L
+#define OPENSSL_VERSION_NUMBER	0x009080d1L
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8l-fips-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8m-fips-beta1 20 Jan 2010"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8l-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8m-beta1 20 Jan 2010"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT