Prepare for 1.0.0s release

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

diff --git a/CHANGES b/CHANGES
index e271bd180fbd6ab8e1c4489fb72060d3c0c3168b..d5448a82b03a32b8f4c2ab2b72c6bc27fba7f2ed 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.0r and 1.0.0s [xx XXX xxxx]
+ Changes between 1.0.0r and 1.0.0s [11 Jun 2015]
 
   *) Malformed ECParameters causes infinite loop
 

diff --git a/NEWS b/NEWS
index dd2c0cc14219b666c8d67850f754d5329eba2898..70ea8bcb12825d1aeb793164e295b3f084cb8a8f 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.0r and OpenSSL 1.0.0s [under development]
+  Major changes between OpenSSL 1.0.0r and OpenSSL 1.0.0s [11 Jun 2015]
 
       o Malformed ECParameters causes infinite loop (CVE-2015-1788)
       o Exploitable out-of-bounds read in X509_cmp_time (CVE-2015-1789)

diff --git a/README b/README
index 6a9fb12eeca75428c7b92c49d8ff066344869a0b..a8400bbbc40bb3a7d4119e4a0da2b3016650141f 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.0s-dev
+ OpenSSL 1.0.0s 11 Jun 2015
 
  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 b5a8d275d5dfc84fe24e045529d06395baa250f0..d56033e91ebb35402221b21eb08154564a90cea1 100644 (file)
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -26,11 +26,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x10000130L
+# define OPENSSL_VERSION_NUMBER  0x1000013fL
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0s-fips-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0s-fips 11 Jun 2015"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0s-dev xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0s 11 Jun 2015"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT