[openssl] master update

[patrick.steuer at de.ibm.com]

The branch master has been updated
       via  e74b5dcf16dfd7c91d9f9a7e69c447f00d778e17 (commit)
      from  a90311fead3d8e5178637f2d284fad95a47c281c (commit)


- Log -----------------------------------------------------------------
commit e74b5dcf16dfd7c91d9f9a7e69c447f00d778e17
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Wed Nov 13 18:39:51 2019 +0100

    testutil/init.c rename to testutil/testutil_init.c
    
    Avoid conflicts with some linkers.
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10439)

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

Summary of changes:
 test/build.info                           | 2 +-
 test/testutil/{init.c => testutil_init.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/testutil/{init.c => testutil_init.c} (100%)

diff --git a/test/build.info b/test/build.info
index 468f80dbf9..e4fff15883 100644
--- a/test/build.info
+++ b/test/build.info
@@ -21,7 +21,7 @@ IF[{- !$disabled{tests} -}]
   SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output_helpers.c \
           testutil/driver.c testutil/tests.c testutil/cb.c testutil/stanza.c \
           testutil/format_output.c testutil/tap_bio.c \
-          testutil/test_cleanup.c testutil/main.c testutil/init.c \
+          testutil/test_cleanup.c testutil/main.c testutil/testutil_init.c \
           testutil/options.c testutil/test_options.c \
           testutil/apps_mem.c testutil/random.c $LIBAPPSSRC
   INCLUDE[libtestutil.a]=../include ../apps/include ..
diff --git a/test/testutil/init.c b/test/testutil/testutil_init.c
similarity index 100%
rename from test/testutil/init.c
rename to test/testutil/testutil_init.c