[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d0ccefdb77f94bec662d75aeadd0b081641abd19 (commit)
       via  4b2981f13e6d2090a656dec5e877b849331c3b69 (commit)
      from  b4810b70ff79bef340a9447789622b6066a6361b (commit)


- Log -----------------------------------------------------------------
commit d0ccefdb77f94bec662d75aeadd0b081641abd19
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon May 17 23:10:11 2021 +0200

    Disable loader_attic by default on VMS
    
    The reason is that it currently doesn't build properly, due to the of
    pvkfmt.c, causing multiply defined symbols since libcrypto exports
    them as well.  At the same time, it can't do without that source file,
    or it won't have access to certain internal symbols from there.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15320)

commit 4b2981f13e6d2090a656dec5e877b849331c3b69
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon May 17 23:10:02 2021 +0200

    Make it possible to disable the loader_attic engine
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15320)

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

Summary of changes:
 Configurations/10-main.conf |  2 +-
 Configure                   |  1 +
 engines/build.info          | 22 ++++++++++++----------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 122d3f46db..117598eb06 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1857,7 +1857,7 @@ my %targets = (
         asflags          => sub { vms_info()->{asflags} },
         perlasm_scheme   => sub { vms_info()->{perlasm_scheme} },
 
-        disable          => add('pinshared'),
+        disable          => add('pinshared', 'loadereng'),
 
     },
 
diff --git a/Configure b/Configure
index 16f12565ab..a6fb8324a0 100755
--- a/Configure
+++ b/Configure
@@ -449,6 +449,7 @@ my @disablables = (
     "idea",
     "ktls",
     "legacy",
+    "loadereng",
     "makedepend",
     "md2",
     "md4",
diff --git a/engines/build.info b/engines/build.info
index e275035946..cae014ecc6 100644
--- a/engines/build.info
+++ b/engines/build.info
@@ -69,8 +69,19 @@ IF[{- !$disabled{"engine"} -}]
         GENERATE[devcrypto.ld]=../util/engines.num
       ENDIF
     ENDIF
+    IF[{- !$disabled{"loadereng"} -}]
+      MODULES{engine}=loader_attic
+      SOURCE[loader_attic]=e_loader_attic.c ../crypto/pem/pvkfmt.c
+      DEFINE[loader_attic]=OPENSSL_NO_PROVIDER_CODE
+      DEPEND[loader_attic]=../libcrypto
+      INCLUDE[loader_attic]=../include
+      IF[{- defined $target{shared_defflag} -}]
+        SOURCE[loader_attic]=loader_attic.ld
+        GENERATE[loader_attic.ld]=../util/engines.num
+      ENDIF
+    ENDIF
 
-    MODULES{noinst,engine}=ossltest dasync loader_attic
+    MODULES{noinst,engine}=ossltest dasync
     SOURCE[dasync]=e_dasync.c
     DEPEND[dasync]=../libcrypto
     INCLUDE[dasync]=../include
@@ -86,15 +97,6 @@ IF[{- !$disabled{"engine"} -}]
       SOURCE[ossltest]=ossltest.ld
       GENERATE[ossltest.ld]=../util/engines.num
     ENDIF
-
-    SOURCE[loader_attic]=e_loader_attic.c ../crypto/pem/pvkfmt.c
-    DEFINE[loader_attic]=OPENSSL_NO_PROVIDER_CODE
-    DEPEND[loader_attic]=../libcrypto
-    INCLUDE[loader_attic]=../include
-    IF[{- defined $target{shared_defflag} -}]
-      SOURCE[loader_attic]=loader_attic.ld
-      GENERATE[loader_attic.ld]=../util/engines.num
-    ENDIF
   ENDIF
   GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl
   GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl