Prepare for 1.1.0f-dev

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/CHANGES b/CHANGES
index cc06923cffe122ba0314c37a372307702862b091..76041ced868b72587846375bfae9a5a341024134 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.1.0e and 1.1.0f [xx XXX xxxx]
+
+  *)
+
  Changes between 1.1.0d and 1.1.0e [16 Feb 2017]
 
   *) Encrypt-Then-Mac renegotiation crash

diff --git a/NEWS b/NEWS
index f331ec4bc797064c88f76099de74f5ae907b4022..582d66eb5a1d288d238a2e48e6c0f47a0b27091a 100644 (file)
--- 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.0e and OpenSSL 1.1.0f [under development]
+
+      o
+
   Major changes between OpenSSL 1.1.0d and OpenSSL 1.1.0e [16 Feb 2017]
 
       o Encrypt-Then-Mac renegotiation crash (CVE-2017-3733)

diff --git a/README b/README
index 29979abee59afb2f43ed6052c253756202e1183d..105a67630897142cd23209e0c375a7c136362db0 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0e 16 Feb 2017
+ OpenSSL 1.1.0f-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 9d6708fa8bc5184e109a260ecd483151d02fba4b..cffeb01eaf44a0c56139acf7dab6dd637627394d 100644 (file)
--- 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  0x1010005fL
+# define OPENSSL_VERSION_NUMBER  0x10100060L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0e-fips  16 Feb 2017"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0e  16 Feb 2017"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-dev  xx XXX xxxx"
 # endif
 
 /*-