[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  adf3f83e5227206a011ca1bca3ef9f63709fb96e (commit)
      from  b8ea8d3912006223891a621a7bff19225e93469d (commit)


- Log -----------------------------------------------------------------
commit adf3f83e5227206a011ca1bca3ef9f63709fb96e
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Jul 29 13:58:18 2020 +0100

    Fix test_cmp_cli for extended tests
    
    The test_cmp_cli was failing in the extended tests on cross-compiled
    mingw builds. This was due to the test not using wine when it should do.
    The simplest solution is to just skip the test in this case.
    
    [extended tests]
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12555)

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

Summary of changes:
 test/recipes/81-test_cmp_cli.t | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/recipes/81-test_cmp_cli.t b/test/recipes/81-test_cmp_cli.t
index 009cdcc4d8..51b4baf6a5 100644
--- a/test/recipes/81-test_cmp_cli.t
+++ b/test/recipes/81-test_cmp_cli.t
@@ -34,6 +34,8 @@ plan skip_all => "These tests are not supported in a no-ec build"
 
 plan skip_all => "Tests involving CMP server not available on Windows or VMS"
     if $^O =~ /^(VMS|MSWin32)$/;
+plan skip_all => "Tests involving CMP server not available in cross-compile builds"
+    if defined $ENV{EXE_SHELL};
 plan skip_all => "Tests involving CMP server require 'kill' command"
     unless `which kill`;
 plan skip_all => "Tests involving CMP server require 'lsof' command"