summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-06-11 15:16:43 +0100
committerMatt Caswell <matt@openssl.org>2015-06-11 15:16:43 +0100
commitc9f4108465b7fb2ddf5be2d8cc80b120731a7906 (patch)
tree85f236efd3df83e7b533629317ff02eb1bc5bc92
parenta06ec5a26fdb24fd829abef54422d94521ddd14a (diff)
Prepare for 1.0.0t-dev
Reviewed-by: Stephen Henson <steve@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 d5448a82b0..ccf2c03dc6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
OpenSSL CHANGES
_______________
+ Changes between 1.0.0s and 1.0.0t [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 70ea8bcb12..99ba9605c3 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.0s and OpenSSL 1.0.0t [under development]
+
+ o
+
Major changes between OpenSSL 1.0.0r and OpenSSL 1.0.0s [11 Jun 2015]
o Malformed ECParameters causes infinite loop (CVE-2015-1788)
diff --git a/README b/README
index a8400bbbc4..2556b8c31e 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.0s 11 Jun 2015
+ OpenSSL 1.0.0t-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 d56033e91e..5f79fb0ec9 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 0x1000013fL
+# define OPENSSL_VERSION_NUMBER 0x10000140L
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0s-fips 11 Jun 2015"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0t-fips-dev xx XXX xxxx"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0s 11 Jun 2015"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0t-dev xx XXX xxxx"
# endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/openssl.spec b/openssl.spec
index a85f0fefc6..e282acafdc 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.0s
+Version: 1.0.0t
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries