[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  08312719bafc93d9d93ed8b23931f2d18fc767d7 (commit)
      from  3b1bfd2160a165a9a1fccc20ab0410e35c435f65 (commit)


- Log -----------------------------------------------------------------
commit 08312719bafc93d9d93ed8b23931f2d18fc767d7
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Oct 30 13:16:46 2020 +0100

    test/recipes/90-test_shlibload.t: Skip when address sanitizer enabled
    
    Because this test loads the shared libraries dynamically, there are
    cases where that results in errors because the ASAN library wasn't
    loaded first.  That makes this test unsuitable in an ASAN build.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13281)

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

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

diff --git a/test/recipes/90-test_shlibload.t b/test/recipes/90-test_shlibload.t
index e73748279b..d3944308d3 100644
--- a/test/recipes/90-test_shlibload.t
+++ b/test/recipes/90-test_shlibload.t
@@ -23,6 +23,7 @@ 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 only supported in a dso build" if disabled("dso");
+plan skip_all => "Test is disabled in an address sanitizer build" unless disabled("asan");
 
 plan tests => 10;