[openssl] master update

[dev]

The branch master has been updated
       via  5d8ea84efaf172af76461855988de2ac8b88beb0 (commit)
       via  c796cc9768f346adde469d329afcbb1f220158ff (commit)
      from  43c2456f0f1a3b446fc9a1b1af43e6f8cef934fc (commit)


- Log -----------------------------------------------------------------
commit 5d8ea84efaf172af76461855988de2ac8b88beb0
Author: Dr. David von Oheimb <david.von.ohe...@siemens.com>
Date:   Wed Jun 2 16:47:58 2021 +0200

    80-test_http.t: Rename to 79-test_http.t, add basic HTTP server ACCEPT test
    
    Reviewed-by: Tomas Mraz <to...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15592)

commit c796cc9768f346adde469d329afcbb1f220158ff
Author: Dr. David von Oheimb <david.von.ohe...@siemens.com>
Date:   Wed Jun 2 15:52:26 2021 +0200

    80-test_cmp_http.t: Improve comparison on server_port variable
    
    Reviewed-by: Tomas Mraz <to...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15592)

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

Summary of changes:
 test/recipes/{80-test_http.t => 79-test_http.t} | 11 ++++++++---
 test/recipes/80-test_cmp_http.t                 |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)
 rename test/recipes/{80-test_http.t => 79-test_http.t} (56%)

diff --git a/test/recipes/80-test_http.t b/test/recipes/79-test_http.t
similarity index 56%
rename from test/recipes/80-test_http.t
rename to test/recipes/79-test_http.t
index 2297c5a537..b5bb74393a 100644
--- a/test/recipes/80-test_http.t
+++ b/test/recipes/79-test_http.t
@@ -12,10 +12,15 @@ use OpenSSL::Test::Utils;
 
 setup("test_http");
 
-plan tests => 1;
+plan tests => 2;
 
 SKIP: {
     skip "sockets disabled", 1 if disabled("sock");
-    ok(run(test(["http_test",
-                 srctop_file("test", "certs", "ca-cert.pem")])));
+    skip "OCSP disabled", 1 if disabled("ocsp");
+    my $cmd = [qw{openssl ocsp -index any -port 0}];
+    my @output = run(app($cmd), capture => 1);
+    ok($output[0] =~ /^ACCEPT (0.0.0.0|\[::\]):(\d+?)$/ && $2 >= 1024,
+       "HTTP server auto-selects and reports local port >= 1024");
 }
+
+ok(run(test(["http_test", srctop_file("test", "certs", "ca-cert.pem")])));
diff --git a/test/recipes/80-test_cmp_http.t b/test/recipes/80-test_cmp_http.t
index bcec27f949..910c751eec 100644
--- a/test/recipes/80-test_cmp_http.t
+++ b/test/recipes/80-test_cmp_http.t
@@ -277,7 +277,7 @@ sub start_mock_server {
     die "Invalid port: $server_port" unless $server_port =~ m/^\d+$/;
     my $pid = open($server_fh, "$cmd|") or die "Trying to $cmd";
     print "Pid is: $pid\n";
-    if ($server_port eq "0") {
+    if ($server_port == 0) {
         # Find out the actual server port
         while (<$server_fh>) {
             print;