[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  9fcfd0cd860610d69268414b9671b5ed3274bfcd (commit)
       via  be2df12a349eae53805dd3cb19aa18e3d022acd7 (commit)
      from  b0edda11cbfe91e8b99b09909a80a810d0143891 (commit)


- Log -----------------------------------------------------------------
commit 9fcfd0cd860610d69268414b9671b5ed3274bfcd
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 20 13:15:39 2018 +0000

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

commit be2df12a349eae53805dd3cb19aa18e3d022acd7
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 20 13:13:56 2018 +0000

    Prepare for 1.1.1-pre3 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 84913bc..b24d318 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.1.1-pre3-dev
+ OpenSSL 1.1.1-pre4-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 32b6f4d..c3bd6af 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  0x10101003L
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1-pre3-dev  xx XXX xxxx"
+# define OPENSSL_VERSION_NUMBER  0x10101004L
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1-pre4-dev  xx XXX xxxx"
 
 #define OPENSSL_MAKE_VERSION(maj,min,fix,patch) ((0x10000000L)+((maj&0xff)<<20)+((min&0xff)<<12)+((fix&0xff)<<4)+patch)