[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  ed2e5b612d9b85b8b550a9231c3ae69be26e3d89 (commit)
      from  53eecb5de5e97fe436a1ccaff8bad5aaa8fb3edc (commit)


- Log -----------------------------------------------------------------
commit ed2e5b612d9b85b8b550a9231c3ae69be26e3d89
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Fri Mar 26 13:20:17 2021 +1000

    Disable cmp_http test on AIX
    
    AIX has permission problems of the form:
    
    lsof: can't open /dev/mem: Permission denied
    lsof: can't open /dev/kmem: Permission denied
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14692)

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

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

diff --git a/test/recipes/80-test_cmp_http.t b/test/recipes/80-test_cmp_http.t
index e68844ebf1..4315b1c439 100644
--- a/test/recipes/80-test_cmp_http.t
+++ b/test/recipes/80-test_cmp_http.t
@@ -29,8 +29,8 @@ plan skip_all => "These tests are not supported in a no-cmp build"
 plan skip_all => "These tests are not supported in a no-ec build"
     if disabled("ec");
 
-plan skip_all => "Tests involving local HTTP server not available on Windows or VMS"
-    if $^O =~ /^(VMS|MSWin32)$/;
+plan skip_all => "Tests involving local HTTP server not available on Windows, AIX or VMS"
+    if $^O =~ /^(VMS|MSWin32|AIX)$/;
 plan skip_all => "Tests involving local HTTP server not available in cross-compile builds"
     if defined $ENV{EXE_SHELL};
 plan skip_all => "Tests involving local HTTP server require 'kill' command"