aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-12-03 14:57:35 +0000
committerMatt Caswell <matt@openssl.org>2015-12-03 14:57:35 +0000
commitf93aad4a56a1580a109785c2c922fe6b8baf7df9 (patch)
treedd18a7e753ffbe9565f4d0dae279d66dc08e95ae
parentce052c8437fb97cbc57f034fa94b5bcd749dbf52 (diff)
downloadopenssl-OpenSSL_1_0_0-stable.tar.gz
Prepare for 1.0.0u-devOpenSSL_1_0_0-stable
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--CHANGES4
-rw-r--r--NEWS4
-rw-r--r--README2
-rw-r--r--crypto/opensslv.h6
-rw-r--r--openssl.spec2
5 files changed, 13 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 4feb38dd8e..9cea9e66ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
OpenSSL CHANGES
_______________
+ Changes between 1.0.0t and 1.0.0u [xx XXX xxxx]
+
+ *)
+
Changes between 1.0.0s and 1.0.0t [3 Dec 2015]
*) X509_ATTRIBUTE memory leak
diff --git a/NEWS b/NEWS
index c7f96f7fd2..d688d4b13c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@
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.0t and OpenSSL 1.0.0u [under development]
+
+ o
+
Major changes between OpenSSL 1.0.0s and OpenSSL 1.0.0t [3 Dec 2015]
o X509_ATTRIBUTE memory leak (CVE-2015-3195)
diff --git a/README b/README
index 339d40ea72..f2f62b009a 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.0t 3 Dec 2015
+ OpenSSL 1.0.0u-dev
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 f7ec306407..3f7c741258 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 0x1000014fL
+# define OPENSSL_VERSION_NUMBER 0x10000150L
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0t-fips 3 Dec 2015"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0u-fips-dev xx XXX xxxx"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0t 3 Dec 2015"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0u-dev xx XXX xxxx"
# endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/openssl.spec b/openssl.spec
index e282acafdc..a45c687a6d 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -6,7 +6,7 @@ Release: 1
Summary: Secure Sockets Layer and cryptography libraries and tools
Name: openssl
-Version: 1.0.0t
+Version: 1.0.0u
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries