summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-03-01 13:40:46 +0000
committerMatt Caswell <matt@openssl.org>2016-03-01 13:40:46 +0000
commit57ac73fb5d0a878f282cbcd9e7951c77fdc59e3c (patch)
treef05820817f23f242abb9491298ac0ae91dc53494
parent5d2b93ad7b57bd421579bf111882a0f495f03e38 (diff)
Prepare for 1.0.1s releaseOpenSSL_1_0_1s
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--CHANGES2
-rw-r--r--NEWS2
-rw-r--r--README2
-rw-r--r--crypto/opensslv.h6
4 files changed, 6 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index a78e7542a8..19e07abc46 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
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
diff --git a/NEWS b/NEWS
index 83b3a64ca5..26c7aa5d33 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 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
diff --git a/README b/README
index 642ed5521e..adde4e8d7e 100644
--- 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
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 471767ced7..4ec6ff9552 100644
--- 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)
*/
-# define OPENSSL_VERSION_NUMBER 0x10001130L
+# define OPENSSL_VERSION_NUMBER 0x1000113fL
# 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
-# 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