From 91bad2b09eb2ad77da8aca29f80f2d0677e75423 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Mon, 29 Mar 2010 13:11:54 +0000
Subject: [PATCH] Prepare for 1.0.0 release - finally ;-)

---
 CHANGES           |  2 +-
 FAQ               |  2 +-
 NEWS              |  7 ++++++-
 README            |  2 +-
 STATUS            | 10 ++++------
 crypto/opensslv.h |  6 +++---
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2f82410153..e8655ab145 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 0.9.8n and 1.0.0  [xx XXX xxxx]
+ Changes between 0.9.8n and 1.0.0  [29 Mar 2010]
 
   *) Add "missing" function EVP_CIPHER_CTX_copy(). This copies a cipher
      context. The operation can be customised via the ctrl mechanism in
diff --git a/FAQ b/FAQ
index 1080069a04..2134e3af12 100644
--- a/FAQ
+++ b/FAQ
@@ -79,7 +79,7 @@ OpenSSL  -  Frequently Asked Questions
 * Which is the current version of OpenSSL?
 
 The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 0.9.8n was released on Mar 24th, 2010.
+OpenSSL 1.0.0 was released on Mar 29th, 2010.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
diff --git a/NEWS b/NEWS
index 0e9514a6db..4fc76d10f4 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@
   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 1.0:
+  Major changes between OpenSSL 0.9.8n and OpenSSL 1.0:
 
       o RFC3280 path validation: sufficient to process PKITS tests.
       o Integrated support for PVK files and keyblobs.
@@ -28,6 +28,11 @@
       o Opaque PRF Input TLS extension support.
       o Updated time routines to avoid OS limitations.
 
+  Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n:
+
+      o CFB cipher definition fixes.
+      o Fix security issues CVE-2010-0740 and CVE-2010-0433.
+
   Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m:
 
       o Cipher definition fixes.
diff --git a/README b/README
index 608a782ea5..b649a66d12 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.0-beta6-dev xx XXX xxxx
+ OpenSSL 1.0.0 29 Mar 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 8ebeb8d0a1..f370bccf1a 100644
--- a/STATUS
+++ b/STATUS
@@ -1,14 +1,12 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2010/01/20 15:00:48 $
+  ______________                           $Date: 2010/03/29 13:11:53 $
 
   DEVELOPMENT STATE
 
-    o  OpenSSL 1.0.0-beta5: Released on January 20th, 2010
-    o  OpenSSL 1.0.0-beta4: Released on November 10th, 2009
-    o  OpenSSL 1.0.0-beta3: Released on July 15th, 2009
-    o  OpenSSL 1.0.0-beta2: Released on April 21st, 2009
-    o  OpenSSL 1.0.0-beta1: Released on April 1st, 2009
+    o  OpenSSL 1.0.0:  Released on March     29th, 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
     o  OpenSSL 0.9.8k: Released on March     25th, 2009
     o  OpenSSL 0.9.8j: Released on January    7th, 2009
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 069847c0a3..cbe52648d3 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	0x10000006L
+#define OPENSSL_VERSION_NUMBER	0x1000000fL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0-fips-beta6-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0-fips 29 Mar 2010"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0-beta6-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0 29 Mar 2010"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 
-- 
2.25.1