[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e1f5a92df4b612de8eac7ca538ef44f4b1deec5a (commit)
      from  7d6766cb537e5cebc99e200bc537f744878a87a4 (commit)


- Log -----------------------------------------------------------------
commit e1f5a92df4b612de8eac7ca538ef44f4b1deec5a
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 29 10:31:56 2020 +0200

    Configure: handle undefined shared_target.
    
    Some very basic config targets don't defined the 'shared_target'
    attribute at all.  This wasn't handled well enough in Configure.
    This also cleans away an explicit reference to the ossltest engine in
    Configurations/unix-Makefile.tmpl, which isn't necessary since the
    build.info attributes were added.
    
    Fixes openssl/web#197
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13031)

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

Summary of changes:
 Configurations/unix-Makefile.tmpl | 6 ------
 Configure                         | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index ac19141a95..36a7ffbf93 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -733,9 +733,6 @@ uninstall_engines:
 	@set -e; for e in dummy $(INSTALL_ENGINES); do \
 		if [ "$$e" = "dummy" ]; then continue; fi; \
 		fn=`basename $$e`; \
-		if [ "$$fn" = '{- platform->dso("ossltest") -}' ]; then \
-			continue; \
-		fi; \
 		$(ECHO) "$(RM) $(DESTDIR)$(ENGINESDIR)/$$fn"; \
 		$(RM) $(DESTDIR)$(ENGINESDIR)/$$fn; \
 	done
@@ -760,9 +757,6 @@ uninstall_modules:
 	@set -e; for e in dummy $(INSTALL_MODULES); do \
 		if [ "$$e" = "dummy" ]; then continue; fi; \
 		fn=`basename $$e`; \
-		if [ "$$fn" = '{- platform->dso("ossltest") -}' ]; then \
-			continue; \
-		fi; \
 		$(ECHO) "$(RM) $(DESTDIR)$(MODULESDIR)/$$fn"; \
 		$(RM) $(DESTDIR)$(MODULESDIR)/$$fn; \
 	done
diff --git a/Configure b/Configure
index 6219e2e37e..dfad3fe7a5 100755
--- a/Configure
+++ b/Configure
@@ -579,7 +579,7 @@ my @disable_cascades = (
     # or modules.
     "pic"               => [ "shared", "module" ],
 
-    "module"            => [ "fips" ],
+    "module"            => [ "fips", "dso" ],
 
     "engine"            => [ grep /eng$/, @disablables ],
     "hw"                => [ "padlockeng" ],
@@ -1444,7 +1444,7 @@ unless($disabled{threads}) {
 }
 
 my $no_shared_warn=0;
-if ($target{shared_target} eq "")
+if (($target{shared_target} // '') eq "")
         {
         $no_shared_warn = 1
             if (!$disabled{shared} || !$disabled{"dynamic-engine"});