summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-09-10 14:37:06 +0100
committerMatt Caswell <matt@openssl.org>2019-09-10 14:37:06 +0100
commita1ff24ad2ced610716635b31c41aad0b11238e88 (patch)
tree5189f4846795b1c65645e5dc021d2cfc0f0c0918
parentcd7c7fc20b9feeb900632389401f514ac6b82f16 (diff)
Prepare for 1.0.2u-dev
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 114ea248d0..df613740a9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
https://github.com/openssl/openssl/commits/ and pick the appropriate
release branch.
+ Changes between 1.0.2t and 1.0.2u [xx XXX xxxx]
+
+ *)
+
Changes between 1.0.2s and 1.0.2t [10 Sep 2019]
*) For built-in EC curves, ensure an EC_GROUP built from the curve name is
diff --git a/NEWS b/NEWS
index a9705fe21c..44add13f6a 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.2t and OpenSSL 1.0.2u [under development]
+
+ o
+
Major changes between OpenSSL 1.0.2s and OpenSSL 1.0.2t [10 Sep 2019]
o Fixed a padding oracle in PKCS7_dataDecode and CMS_decrypt_set1_pkey
diff --git a/README b/README
index dc207429e2..949262f2bd 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.2t 10 Sep 2019
+ OpenSSL 1.0.2u-dev
Copyright (c) 1998-2019 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 488e2bc401..6cd4fffb59 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 0x1000214fL
+# define OPENSSL_VERSION_NUMBER 0x10002150L
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2t-fips 10 Sep 2019"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2u-fips-dev xx XXX xxxx"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2t 10 Sep 2019"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2u-dev xx XXX xxxx"
# endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/openssl.spec b/openssl.spec
index 475ddcf901..9c23c4e1a5 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -7,7 +7,7 @@ Release: 1
Summary: Secure Sockets Layer and cryptography libraries and tools
Name: openssl
-Version: 1.0.2t
+Version: 1.0.2u
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries