[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  ce70766cb22f2ff88d21d5f60f47cfb4d126ca61 (commit)
       via  c612c7a455d9b3ea602c87fe720d09535f1f6e37 (commit)
      from  8f3683cda197cd3df1005dc058a2d57be0b6cc5a (commit)


- Log -----------------------------------------------------------------
commit ce70766cb22f2ff88d21d5f60f47cfb4d126ca61
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Fri Apr 16 17:52:22 2021 +0200

    Makefile: Make sure providers/fipsmodule.cnf is re-built also for run_tests
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14901)

commit c612c7a455d9b3ea602c87fe720d09535f1f6e37
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Fri Apr 16 17:51:55 2021 +0200

    Makefile: Simplify use of run_tests
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14901)

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

Summary of changes:
 Configurations/unix-Makefile.tmpl | 11 ++++-------
 providers/build.info              |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 3f78d6d5de..c07f8dd748 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -506,7 +506,8 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) build_docs
 all: build_sw build_docs
 
 test: tests
-{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils
+{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils run_tests
+run_tests:
 	@ : {- output_off() if $disabled{tests}; "" -}
 	( SRCTOP=$(SRCDIR) \
 	  BLDTOP=$(BLDDIR) \
@@ -520,8 +521,7 @@ test: tests
 
 list-tests:
 	@ : {- output_off() if $disabled{tests}; "" -}
-	@SRCTOP="$(SRCDIR)" \
-	 $(PERL) $(SRCDIR)/test/run_tests.pl list
+	$(MAKE) run_tests TESTS=list
 	@ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
 	@echo "Tests are not supported with your chosen Configure options"
 	@ : {- output_on() if !$disabled{tests}; "" -}
@@ -1254,10 +1254,7 @@ ordinals: build_generated
                 $(SSLHEADERS)
 
 test_ordinals:
-	( cd test; \
-	  SRCTOP=../$(SRCDIR) \
-	  BLDTOP=../$(BLDDIR) \
-	    $(PERL) ../$(SRCDIR)/test/run_tests.pl test_ordinals )
+	$(MAKE) run_tests TESTS=test_ordinals
 
 tags TAGS: FORCE
 	rm -f TAGS tags
diff --git a/providers/build.info b/providers/build.info
index 065b570253..e9ec4cf646 100644
--- a/providers/build.info
+++ b/providers/build.info
@@ -119,7 +119,7 @@ IF[{- !$disabled{fips} -}]
   # the generated commands in build templates are expected to catch that,
   # and thereby keep control over the exact output file location.
   IF[{- !$disabled{tests} -}]
-    DEPEND[|tests|]=fipsmodule.cnf
+    DEPEND[|run_tests|]=fipsmodule.cnf
     GENERATE[fipsmodule.cnf]=../apps/openssl fipsinstall \
           -module providers/$(FIPSMODULENAME) -provider_name fips \
           -mac_name HMAC -section_name fips_sect