[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3f71add9e57fb48cb5efdc765860daf754db40e9 (commit)
      from  50ccc176da8644be079eccc4523c261e34f7b293 (commit)


- Log -----------------------------------------------------------------
commit 3f71add9e57fb48cb5efdc765860daf754db40e9
Author: Randall S. Becker <rsbecker at nexbridge.com>
Date:   Thu Jan 28 11:05:02 2021 -0700

    Enable fipsload test on NonStop x86.
    
    CLA: Trivial
    
    Fixes: #14005
    
    Signed-off-by: Randall S. Becker <rsbecker at nexbridge.com>
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14006)

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

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

diff --git a/test/recipes/90-test_fipsload.t b/test/recipes/90-test_fipsload.t
index c4f713385d..0e08837ad2 100644
--- a/test/recipes/90-test_fipsload.t
+++ b/test/recipes/90-test_fipsload.t
@@ -18,7 +18,7 @@ use platform;
 
 plan skip_all => 'Test only supported in a shared build' if disabled('shared');
 plan skip_all => 'Test is disabled on AIX' if config('target') =~ m|^aix|;
-plan skip_all => 'Test is disabled on NonStop' if config('target') =~ m|^nonstop|;
+plan skip_all => 'Test is disabled on NonStop ia64' if config('target') =~ m|^nonstop-nse|;
 plan skip_all => 'Test only supported in a dso build' if disabled('dso');
 plan skip_all => 'Test is disabled in an address sanitizer build' unless disabled('asan');