Prepare for 1.0.0o release

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

diff --git a/CHANGES b/CHANGES
index cc4e4cf77b048c213572d06fcda1b7cc16a57244..60792cb06acdc455bd7c7f2f101ab0464f8895ed 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.0n and 1.0.0o [xx XXX xxxx]
+ Changes between 1.0.0n and 1.0.0o [15 Oct 2014]
 
   *) Session Ticket Memory Leak.
 

diff --git a/NEWS b/NEWS
index 6ed819421e581302783b5c7fe2c38d4250b3c6e9..bdad21ca132eb1e314501a3fcbf743c67c02be1b 100644 (file)
--- 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 1.0.0n and OpenSSL 1.0.0o [under development]
+  Major changes between OpenSSL 1.0.0n and OpenSSL 1.0.0o [15 Oct 2014]
 
       o Fix for CVE-2014-3513
       o Fix for CVE-2014-3567

diff --git a/README b/README
index 32734c7e9ba33071979885b35d4264e40021f382..36d7aa17b89686f003c15adb9228e7d1a142a635 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.0o-dev
+ OpenSSL 1.0.0o 15 Oct 2014
 
  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 78e88b10e4df4af0d1510074d5f270c5401af388..edad266c2568751ab2eea9e24f135c51fa5ee031 100644 (file)
--- 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 0x100000f0L
+#define OPENSSL_VERSION_NUMBER 0x100000ffL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.0o-fips-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.0o-fips 15 Oct 2014"
 #else
-#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.0o-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT   "OpenSSL 1.0.0o 15 Oct 2014"
 #endif
 #define OPENSSL_VERSION_PTEXT  " part of " OPENSSL_VERSION_TEXT