[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  f4b076e6e683d36ebeb496f15c06020e0b9bdccd (commit)
       via  facdcba99b4f7c1bcd209c9ecec9a9c595c064f5 (commit)
      from  ba50543550c363e18bd6a7a1f3a757c50b0480a0 (commit)


- Log -----------------------------------------------------------------
commit f4b076e6e683d36ebeb496f15c06020e0b9bdccd
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 3 14:26:16 2018 +0100

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

commit facdcba99b4f7c1bcd209c9ecec9a9c595c064f5
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 3 14:24:18 2018 +0100

    Prepare for 1.1.1-pre4 release
    
    Reviewed-by: Richard Levitte <levitte 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 b24d318..694411d 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.1-pre4-dev
+ OpenSSL 1.1.1-pre5-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 c3bd6af..06c8b7c 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  0x10101004L
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1-pre4-dev  xx XXX xxxx"
+# define OPENSSL_VERSION_NUMBER  0x10101005L
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1-pre5-dev  xx XXX xxxx"
 
 #define OPENSSL_MAKE_VERSION(maj,min,fix,patch) ((0x10000000L)+((maj&0xff)<<20)+((min&0xff)<<12)+((fix&0xff)<<4)+patch)