[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  fc4e1ab4708a3eb87a107df7e085d0d8125c5171 (commit)
       via  1708e3e85b4a86bae26860aa5d2913fc8eff6086 (commit)
      from  1212818eb07add297fe562eba80ac46a9893781e (commit)


- Log -----------------------------------------------------------------
commit fc4e1ab4708a3eb87a107df7e085d0d8125c5171
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 11 13:49:46 2018 +0100

    Prepare for 1.1.1a-dev
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 1708e3e85b4a86bae26860aa5d2913fc8eff6086
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 11 13:48:18 2018 +0100

    Prepare for 1.1.1 release
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/CHANGES b/CHANGES
index 63fe26c..0499bd5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,11 @@
  https://github.com/openssl/openssl/commits/ and pick the appropriate
  release branch.
 
- Changes between 1.1.0i and 1.1.1 [xx XXX xxxx]
+ Changes between 1.1.1 and 1.1.1a [xx XXX xxxx]
+
+  *)
+
+ Changes between 1.1.0i and 1.1.1 [11 Sep 2018]
 
   *) Add a new ClientHello callback. Provides a callback interface that gives
      the application the ability to adjust the nascent SSL object at the
diff --git a/NEWS b/NEWS
index ae0c2d7..4026385 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.1.0i and OpenSSL 1.1.1 [in pre-release]
+  Major changes between OpenSSL 1.1.1 and OpenSSL 1.1.1a [under development]
+
+      o
+
+  Major changes between OpenSSL 1.1.0i and OpenSSL 1.1.1 [11 Sep 2018]
 
       o Support for TLSv1.3 added (see https://wiki.openssl.org/index.php/TLS1.3
         for further important information). The TLSv1.3 implementation includes:
diff --git a/README b/README
index 6075f16..5817b54 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.1-pre10-dev
+ OpenSSL 1.1.1a-dev
 
  Copyright (c) 1998-2018 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 b866670..2a54f2c 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -39,8 +39,8 @@ 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  0x1010100aL
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1-pre10-dev  xx XXX xxxx"
+# define OPENSSL_VERSION_NUMBER  0x10101010L
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1a-dev  xx XXX xxxx"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)