Prepare for 1.0.1s release

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/CHANGES b/CHANGES
index a78e7542a861624de8e209c6b1a1645eac042ae9..19e07abc4619801cc657246698bee3c4929ea894 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
  OpenSSL CHANGES
  _______________
 

- Changes between 1.0.1r and 1.0.1s [xx XXX xxxx]
+ Changes between 1.0.1r and 1.0.1s [1 Mar 2016]

 
   * Disable weak ciphers in SSLv3 and up in default builds of OpenSSL.
     Builds that are not configured with "enable-weak-ssl-ciphers" will not
 
   * Disable weak ciphers in SSLv3 and up in default builds of OpenSSL.
     Builds that are not configured with "enable-weak-ssl-ciphers" will not

diff --git a/NEWS b/NEWS
index 83b3a64ca5923d5f90f571859cdf09065d2a84fc..26c7aa5d33412ba72c0e701a6ab5e513ec976dee 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.
 
   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.1r and OpenSSL 1.0.1s [under development]
+  Major changes between OpenSSL 1.0.1r and OpenSSL 1.0.1s [1 Mar 2016]

 
       o Disable weak ciphers in SSLv3 and up in default builds of OpenSSL.
       o Disable SSLv2 default build, default negotiation and weak ciphers
 
       o Disable weak ciphers in SSLv3 and up in default builds of OpenSSL.
       o Disable SSLv2 default build, default negotiation and weak ciphers

diff --git a/README b/README
index 642ed5521e0080d5ee06a5298ca89dbfd2eddea5..adde4e8d7e4e32cc07a298558429b2071a725f31 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
 

- OpenSSL 1.0.1s-dev
+ OpenSSL 1.0.1s 1 Mar 2016

 
  Copyright (c) 1998-2015 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
 
  Copyright (c) 1998-2015 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 471767ced76c0b9bf9ce3348727d410645b593fb..4ec6ff955246a64ba9e8201b63baa4fd1afc7740 100644 (file)
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */

-# define OPENSSL_VERSION_NUMBER  0x10001130L
+# define OPENSSL_VERSION_NUMBER  0x1000113fL

 # ifdef OPENSSL_FIPS
 # ifdef OPENSSL_FIPS

-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1s-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1s-fips  1 Mar 2016"

 # else
 # else

-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1s-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1s  1 Mar 2016"

 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT