Prepare for 1.1.0g release

Reviewed-by: Andy Polyakov <appro@openssl.org>

diff --git a/CHANGES b/CHANGES
index 17969d1f857b80d981bfe9e0f92cd54032e7777d..761148aa32b1138885549bfc951b592470dfe432 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
  https://github.com/openssl/openssl/commits/ and pick the appropriate
  release branch.
 
- Changes between 1.1.0f and 1.1.0g [xx XXX xxxx]
+ Changes between 1.1.0f and 1.1.0g [2 Nov 2017]
 
   *) bn_sqrx8x_internal carry bug on x86_64
 

diff --git a/NEWS b/NEWS
index 72b0bc649e686ff10574a6a4aef0131b0ae887a1..1441f7db0485606b69523885aa01eaa0768e7ffd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@
   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]
+  Major changes between OpenSSL 1.1.0f and OpenSSL 1.1.0g [2 Nov 2017]
 
       o bn_sqrx8x_internal carry bug on x86_64 (CVE-2017-3736)
       o Malformed X.509 IPAddressFamily could cause OOB read (CVE-2017-3735)

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