Prepare for 1.1.0g-dev

Reviewed-by: Stephen Henson <steve@openssl.org>

diff --git a/CHANGES b/CHANGES
index 49f9f7882c9ad94265e02e00c0f17a0d1237f0ae..1da3e9b49ce5a81f115c2aafde6bef67d357a2e9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.1.0f and 1.1.0g [xx XXX xxxx]
+
+  *)
+
  Changes between 1.1.0e and 1.1.0f [25 May 2017]
 
   *) Have 'config' recognise 64-bit mingw and choose 'mingw64' as the target

diff --git a/NEWS b/NEWS
index b4db8dfc66137e0702a7a750fdc657910d9b43f9..0332a0c3c303735759e23f25f71889b18740862f 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.0f and OpenSSL 1.1.0g [under development]
+
+      o
+
   Major changes between OpenSSL 1.1.0e and OpenSSL 1.1.0f [25 May 2017]
 
       o config now recognises 64-bit mingw and chooses mingw64 instead of mingw

diff --git a/README b/README
index a7bfd7306391e48eb249697e52fa18a563371edf..6f88dc7682c3b7f9d69316de0e92437b274eb79a 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0f 25 May 2017
+ OpenSSL 1.1.0g-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 f3f1d4190afd6e09f7ac6579b01f8442537b3712..ae567057cf5d5f98813cfeae73afd117df17be7c 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  0x1010006fL
+# define OPENSSL_VERSION_NUMBER  0x10100070L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-fips  25 May 2017"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0g-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f  25 May 2017"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0g-dev  xx XXX xxxx"
 # endif
 
 /*-