diff options
author | Matt Caswell <matt@openssl.org> | 2015-06-11 15:13:36 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-06-11 15:13:36 +0100 |
commit | a06ec5a26fdb24fd829abef54422d94521ddd14a (patch) | |
tree | 4cf9d57efc402197cd00c401a1c4ce6a69db3194 | |
parent | 62bbfe036da827d7347ed15db2974cac7ebca6ab (diff) |
Prepare for 1.0.0s releaseOpenSSL_1_0_0s
Reviewed-by: Stephen Henson <steve@openssl.org>
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | crypto/opensslv.h | 6 |
4 files changed, 6 insertions, 6 deletions
@@ -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 @@ -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) @@ -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 b5a8d275d5..d56033e91e 100644 --- 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 |