[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  afb254d02b20e877230367c0799ab27505b585f4 (commit)
      from  079f8d36ff6c5720a2dcbb8cbf996f05005fffb5 (commit)


- Log -----------------------------------------------------------------
commit afb254d02b20e877230367c0799ab27505b585f4
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jun 15 16:11:51 2021 +0200

    TEST: Change 'catdir' to 'catfile' when dealing with files, in run_tests.pl
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15767)

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

Summary of changes:
 test/run_tests.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/run_tests.pl b/test/run_tests.pl
index ea054bc189..0ed97b2ca9 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -33,11 +33,11 @@ my $recipesdir = catdir($srctop, "test", "recipes");
 my $libdir = rel2abs(catdir($srctop, "util", "perl"));
 my $jobs = $ENV{HARNESS_JOBS} // 1;
 
-$ENV{OPENSSL_CONF} = rel2abs(catdir($srctop, "apps", "openssl.cnf"));
+$ENV{OPENSSL_CONF} = rel2abs(catfile($srctop, "apps", "openssl.cnf"));
 $ENV{OPENSSL_CONF_INCLUDE} = rel2abs(catdir($bldtop, "test"));
 $ENV{OPENSSL_MODULES} = rel2abs(catdir($bldtop, "providers"));
 $ENV{OPENSSL_ENGINES} = rel2abs(catdir($bldtop, "engines"));
-$ENV{CTLOG_FILE} = rel2abs(catdir($srctop, "test", "ct", "log_list.cnf"));
+$ENV{CTLOG_FILE} = rel2abs(catfile($srctop, "test", "ct", "log_list.cnf"));
 
 my %tapargs =
     ( verbosity         => $ENV{HARNESS_VERBOSE} ? 1 : 0,