[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a051af0e75bf717cc818db498d9b977953816f80 (commit)
       via  4ff3df161c8b0caf0acac2e0a19980ccd4173a66 (commit)
      from  28428130db13fe5d1b956a622747db2e0e0b1458 (commit)


- Log -----------------------------------------------------------------
commit a051af0e75bf717cc818db498d9b977953816f80
Author: Richard Levitte <richard at levitte.org>
Date:   Tue Apr 17 15:32:41 2018 +0200

    Prepare for 1.1.1-pre6-dev
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 4ff3df161c8b0caf0acac2e0a19980ccd4173a66
Author: Richard Levitte <richard at levitte.org>
Date:   Tue Apr 17 15:32:02 2018 +0200

    Prepare for 1.1.1-pre5 release
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

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

diff --git a/README b/README
index 694411d..7484255 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.1-pre5-dev
+ OpenSSL 1.1.1-pre6-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 241856d..fc1e2b5 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  0x10101005L
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1-pre5-dev  xx XXX xxxx"
+# define OPENSSL_VERSION_NUMBER  0x10101006L
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1-pre6-dev  xx XXX xxxx"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)