[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  156e34f21d15ba5dbf0995ab57bc7214ba291b05 (commit)
      from  bee5ee5f0649da8a2496227aa4d149d902543be6 (commit)


- Log -----------------------------------------------------------------
commit 156e34f21d15ba5dbf0995ab57bc7214ba291b05
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Aug 25 19:07:17 2016 +0200

    Update CHANGES, NEWS, README and opensslv.h on master
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES                    | 6 +++++-
 NEWS                       | 6 +++++-
 README                     | 2 +-
 include/openssl/opensslv.h | 6 +++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index a5796ac..9c45649 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,11 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 1.0.2h and 1.1.0  [xx XXX xxxx]
+ Changes between 1.1.0 and 1.1.1 [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.0.2h and 1.1.0  [25 Aug 2016]
 
   *) Windows command-line tool supports UTF-8 opt-in option for arguments
      and console input. Setting OPENSSL_WIN32_UTF8 environment variable
diff --git a/NEWS b/NEWS
index 9a46c67..ab9ea17 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,11 @@
   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.2h and OpenSSL 1.1.0 [in pre-release]
+  Major changes between OpenSSL 1.1.0 and OpenSSL 1.1.1 [under development]
+
+      o
+
+  Major changes between OpenSSL 1.0.2h and OpenSSL 1.1.0 [25 Aug 2016]
 
       o Copyright text was shrunk to a boilerplate that points to the license
       o "shared" builds are now the default when possible
diff --git a/README b/README
index a4026ef..cb85bab 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.0-pre7-dev
+ OpenSSL 1.1.1-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 1abd522..df6e045 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  0x10100007L
+# define OPENSSL_VERSION_NUMBER  0x10101000L
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre7-fips-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1-fips-dev  xx XXX xxxx"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0-pre7-dev  xx XXX xxxx"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1-dev  xx XXX xxxx"
 # endif
 
 /*-