From 22872a536328f52f3cbed8607107d7afbc8881f0 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Tue, 1 Jun 2010 14:47:12 +0000
Subject: [PATCH] Prepare for release.

---
 CHANGES           | 2 +-
 NEWS              | 1 +
 README            | 2 +-
 STATUS            | 4 +++-
 crypto/opensslv.h | 6 +++---
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2a1bc37a97..26a5422b1c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 0.9.8n and 0.9.8o [xx XXX xxxx]
+ Changes between 0.9.8n and 0.9.8o [01 Jun 2010]
 
   *) Correct a typo in the CMS ASN1 module which can result in invalid memory
      access or freeing data twice (CVE-2010-0742)
diff --git a/NEWS b/NEWS
index fcc08f3466..857fb94945 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
 
   Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o:
 
+      o Fix for security issue CVE-2010-0742.
       o Various DTLS fixes.
       o Recognise SHA2 certificates if only SSL algorithms added.
       o Fix for no-rc4 compilation.
diff --git a/README b/README
index e2fa4e55c0..bfe7d85a8b 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 0.9.8o-dev
+ OpenSSL 0.9.8o 1 Jun 2010
 
  Copyright (c) 1998-2009 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/STATUS b/STATUS
index 26d5022293..561ce92142 100644
--- a/STATUS
+++ b/STATUS
@@ -1,11 +1,13 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2010/03/30 00:58:23 $
+  ______________                           $Date: 2010/06/01 14:47:11 $
 
   DEVELOPMENT STATE
 
     o  OpenSSL 1.1.0:  Under development...
+    o  OpenSSL 1.0.0a: Released on June      1st,  2010
     o  OpenSSL 1.0.0:  Released on March     29th, 2010
+    o  OpenSSL 0.9.8o: Released on June      1st,  2010
     o  OpenSSL 0.9.8n: Released on March     24th, 2010
     o  OpenSSL 0.9.8m: Released on February  25th, 2010
     o  OpenSSL 0.9.8l: Released on November   5th, 2009
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 2c15f65f79..bfd369cd88 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	0x009080f0L
+#define OPENSSL_VERSION_NUMBER	0x009080ffL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8o-fips-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8o-fips 01 Jun 2010"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8o-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8o 01 Jun 2010"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 
-- 
2.25.1