summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-09-22 11:25:49 +0100
committerMatt Caswell <matt@openssl.org>2016-09-22 11:25:49 +0100
commit9d264d11a93413d2724b7c8c873e56b2ddd8c53f (patch)
treeaa559fc29c157433fff451c88053547eec0c35ed
parent32c130160f7dac2cef5d0e30d94b335e4a87104d (diff)
Prepare for 1.0.2j-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 4bdd390646..c07237917d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
OpenSSL CHANGES
_______________
+ Changes between 1.0.2i and 1.0.2j [xx XXX xxxx]
+
+ *)
+
Changes between 1.0.2h and 1.0.2i [22 Sep 2016]
*) OCSP Status Request extension unbounded memory growth
diff --git a/NEWS b/NEWS
index 5a652841cf..6a787e69ec 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.2i and OpenSSL 1.0.2j [under development]
+
+ o
+
Major changes between OpenSSL 1.0.2h and OpenSSL 1.0.2i [22 Sep 2016]
o OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
diff --git a/README b/README
index 70d4ddd93b..9cba523ef2 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.0.2i 22 Sep 2016
+ OpenSSL 1.0.2j-dev
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 2f585f0e04..c40160b55c 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 0x1000209fL
+# define OPENSSL_VERSION_NUMBER 0x100020a0L
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2i-fips 22 Sep 2016"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j-fips-dev xx XXX xxxx"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2i 22 Sep 2016"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j-dev xx XXX xxxx"
# endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/openssl.spec b/openssl.spec
index e4bf1b7033..880a5c322f 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.2i
+Version: 1.0.2j
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries