[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4ff5b41af15ce731f03bbb43250c8ef1ed88b513 (commit)
      from  b0031e5dc2c8c99a6c04bc7625aa00d3d20a59a5 (commit)


- Log -----------------------------------------------------------------
commit 4ff5b41af15ce731f03bbb43250c8ef1ed88b513
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Jan 25 07:55:36 2020 +0100

    test/recipes/30-test_evp.t: Fix multiple definition of @bffiles
    
    Curiously enough, perl only warned about the shadowing.  However, the
    following 'plan' statement got disturbed somehow, as one could notice
    the test counter say "11/?" instead of "11/25".
    
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/10944)

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

Summary of changes:
 test/recipes/30-test_evp.t | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index 5567cafb3e..11e4b9cae9 100644
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -67,11 +67,11 @@ push @defltfiles, @chachafiles unless disabled("chacha");
 my @bffiles = qw( evpciph_bf.txt );
 push @defltfiles, @bffiles unless disabled("bf");
 
-my @bffiles = qw( evpmd_md2.txt );
-push @defltfiles, @bffiles unless disabled("md2");
+my @md2files = qw( evpmd_md2.txt );
+push @defltfiles, @md2files unless disabled("md2");
 
-my @bffiles = qw( evpmd_mdc2.txt );
-push @defltfiles, @bffiles unless disabled("mdc2");
+my @mdc2files = qw( evpmd_mdc2.txt );
+push @defltfiles, @mdc2files unless disabled("mdc2");
 
 plan tests =>
     ($no_fips ? 0 : 1)          # FIPS install test