summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-09-22 11:15:54 +0100
committerMatt Caswell <matt@openssl.org>2016-09-22 11:15:54 +0100
commit5fe5914d3068128cdc6b08fe72746bb516a30b8a (patch)
tree40011c66b09b8eda655b847a1596df9a6b698875
parentac2c44c6289f9716de4c4beeb284a818eacde517 (diff)
Prepare for 1.1.0b-dev
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--CHANGES4
-rw-r--r--NEWS4
-rw-r--r--README2
-rw-r--r--include/openssl/opensslv.h6
4 files changed, 12 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 63c0ae418b..76b4974145 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
OpenSSL CHANGES
_______________
+ Changes between 1.1.0a and 1.1.0b [xx XXX xxxx]
+
+ *)
+
Changes between 1.1.0 and 1.1.0a [22 Sep 2016]
*) OCSP Status Request extension unbounded memory growth
diff --git a/NEWS b/NEWS
index 88878baf55..66bade1e1e 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.1.0a and OpenSSL 1.1.0b [under development]
+
+ o
+
Major changes between OpenSSL 1.1.0 and OpenSSL 1.1.0a [22 Sep 2016]
o OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
diff --git a/README b/README
index 5bdeee7df4..fdf0f8fdca 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- OpenSSL 1.1.0a 22 Sep 2016
+ OpenSSL 1.1.0b-dev
Copyright (c) 1998-2016 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index bffaac1c38..5cc688132f 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -39,11 +39,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 0x1010001fL
+# define OPENSSL_VERSION_NUMBER 0x10100020L
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0a-fips 22 Sep 2016"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0b-fips-dev xx XXX xxxx"
# else
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0a 22 Sep 2016"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0b-dev xx XXX xxxx"
# endif
/*-