[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  75cce8ddee8c108039d0329c4f84466aad0f9c3c (commit)
       via  574246ae02a206b49957b63b0d4f53992e855e13 (commit)
      from  a5d8a2f8f10b83e5afb297698fe72cee77b1837f (commit)


- Log -----------------------------------------------------------------
commit 75cce8ddee8c108039d0329c4f84466aad0f9c3c
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Mon Jul 12 15:32:02 2021 +0200

    80-test_cmp_http.t: Remove -certout option where not needed
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16052)

commit 574246ae02a206b49957b63b0d4f53992e855e13
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Mon Jul 12 15:30:20 2021 +0200

    cmp_client_test.c: Remove needless dependency on NDEBUG
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16052)

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

Summary of changes:
 test/cmp_client_test.c                           | 14 +-------------
 test/recipes/80-test_cmp_http.t                  |  3 ++-
 test/recipes/80-test_cmp_http_data/Mock/test.cnf |  1 +
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c
index f470f5e445..f4f664a49e 100644
--- a/test/cmp_client_test.c
+++ b/test/cmp_client_test.c
@@ -13,8 +13,6 @@
 
 #include "cmp_mock_srv.h"
 
-#ifndef NDEBUG /* tests need mock server, which is available only if !NDEBUG */
-
 static const char *server_key_f;
 static const char *server_cert_f;
 static const char *client_key_f;
@@ -344,7 +342,7 @@ void cleanup_tests(void)
     return;
 }
 
-# define USAGE "server.key server.crt client.key client.crt client.csr module_name [module_conf_file]\n"
+#define USAGE "server.key server.crt client.key client.crt client.csr module_name [module_conf_file]\n"
 OPT_TEST_DECLARE_USAGE(USAGE)
 
 int setup_tests(void)
@@ -391,13 +389,3 @@ int setup_tests(void)
     ADD_TEST(test_exchange_error);
     return 1;
 }
-
-#else /* !defined (NDEBUG) */
-
-int setup_tests(void)
-{
-    TEST_note("CMP session tests are disabled in this build (NDEBUG).");
-    return 1;
-}
-
-#endif
diff --git a/test/recipes/80-test_cmp_http.t b/test/recipes/80-test_cmp_http.t
index 92f11e8ac8..75acc07a4c 100644
--- a/test/recipes/80-test_cmp_http.t
+++ b/test/recipes/80-test_cmp_http.t
@@ -242,7 +242,8 @@ sub load_tests {
         } else {
             $line =~ s{-section,,}{-section,,-proxy,$proxy,};
         }
-        $line =~ s{-section,,}{-section,,-certout,$result_dir/test.cert.pem,};
+        $line =~ s{-section,,}{-section,,-certout,$result_dir/test.cert.pem,}
+            if $aspect ne "commands" || $line =~ m/,\s*-cmd\s*,\s*(ir|cr|p10cr|kur)\s*,/;
         $line =~ s{-section,,}{-config,../$test_config,-section,$server_name $aspect,};
 
         my @fields = grep /\S/, split ",", $line;
diff --git a/test/recipes/80-test_cmp_http_data/Mock/test.cnf b/test/recipes/80-test_cmp_http_data/Mock/test.cnf
index 87dd575a8a..0853893cd7 100644
--- a/test/recipes/80-test_cmp_http_data/Mock/test.cnf
+++ b/test/recipes/80-test_cmp_http_data/Mock/test.cnf
@@ -84,6 +84,7 @@ extracertsout =
 
 [commands]
 cmd =
+certout =
 cacertsout =
 infotype =
 oldcert =