[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c6ee5d5b42e27b407dfc1fc8845e08c5a75e2221 (commit)
      from  116799ff6a8fc803ec4685fc432c7329d0511e23 (commit)


- Log -----------------------------------------------------------------
commit c6ee5d5b42e27b407dfc1fc8845e08c5a75e2221
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 7 12:48:52 2021 +0200

    Fix test/recipes/90-test_fipsload.t to use bldtop_file for the FIPS module
    
    It used bldtop_dir(), which is incorrect for files.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16532)

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

Summary of changes:
 test/recipes/90-test_fipsload.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/recipes/90-test_fipsload.t b/test/recipes/90-test_fipsload.t
index 9aa39da0e4..7537e2cb75 100644
--- a/test/recipes/90-test_fipsload.t
+++ b/test/recipes/90-test_fipsload.t
@@ -6,7 +6,7 @@
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
 
-use OpenSSL::Test qw/:DEFAULT srctop_dir bldtop_dir/;
+use OpenSSL::Test qw/:DEFAULT srctop_dir bldtop_dir bldtop_file/;
 use OpenSSL::Test::Utils;
 
 BEGIN {
@@ -25,7 +25,7 @@ plan skip_all => 'Test is disabled in an address sanitizer build' unless disable
 
 plan tests => 1;
 
-my $fips = bldtop_dir('providers', platform->dso('fips'));
+my $fips = bldtop_file('providers', platform->dso('fips'));
 
 ok(run(test(['moduleloadtest', $fips, 'OSSL_provider_init'])),
    "trying to load $fips in its own");