[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  7120f1e7c74c8220f43fd28ac7303c0cab29dabe (commit)
      from  c96ce52ce293785b54a42d119c457aef739cc2ce (commit)


- Log -----------------------------------------------------------------
commit 7120f1e7c74c8220f43fd28ac7303c0cab29dabe
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 5 18:38:16 2019 +0100

    padlock: generate assembler source for static libraries too
    
    The GENERATE lines for generating the padlock assembler source were
    wrongly placed in such a way that they only applied to the shared
    library build.
    
    [extended tests]
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/8412)

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

Summary of changes:
 engines/build.info | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/build.info b/engines/build.info
index e5001c4..16907da 100644
--- a/engines/build.info
+++ b/engines/build.info
@@ -20,9 +20,6 @@ IF[{- !$disabled{"engine"} -}]
       SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -}
       DEPEND[padlock]=../libcrypto
       INCLUDE[padlock]=../include
-      GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl \
-        $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR)
-      GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME)
       IF[{- defined $target{shared_defflag} -}]
         SHARED_SOURCE[padlock]=padlock.ld
         GENERATE[padlock.ld]=../util/engines.num
@@ -75,4 +72,7 @@ IF[{- !$disabled{"engine"} -}]
       GENERATE[ossltest.ld]=../util/engines.num
     ENDIF
   ENDIF
+  GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl \
+    $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR)
+  GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME)
 ENDIF