[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  149c12d5e41b238ce4af6d1b6b3a767b40293bd7 (commit)
       via  2fce15b58b2502a614529707eb45b6e5cac4eb15 (commit)
       via  88780b1c5f6000fe6731fec74efe697bcf493b6c (commit)
      from  546ca2f4f5f7e26f7352116754e77f63804b78a6 (commit)


- Log -----------------------------------------------------------------
commit 149c12d5e41b238ce4af6d1b6b3a767b40293bd7
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 13 04:23:14 2019 +0100

    Make the padlock engine build correctly
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8220)

commit 2fce15b58b2502a614529707eb45b6e5cac4eb15
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 13 04:21:59 2019 +0100

    Ensure configured module specific and application specific defines are used
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8220)

commit 88780b1c5f6000fe6731fec74efe697bcf493b6c
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 13 03:58:52 2019 +0100

    Add PADLOCK_ASM to dso_defines rather than lib_defines
    
    Since the padlock code is an engine, the assembler is for a module,
    not a library link to when building a program...  there's a
    distinction.
    
    Fixes #2311
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8220)

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

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

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 1e6709f..dfae9af 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -231,8 +231,8 @@ LIB_CPPFLAGS={- our $lib_cppflags =
                 join(' ', $target{lib_cppflags} || (),
                           $target{shared_cppflag} || (),
                           (map { '-D'.$_ }
-                               @{$config{lib_defines}},
-                               @{$config{shared_defines}}),
+                               @{$config{lib_defines} || ()},
+                               @{$config{shared_defines} || ()}),
                           @{$config{lib_cppflags}},
                           @{$config{shared_cppflag}});
                 join(' ', $lib_cppflags,
@@ -256,6 +256,9 @@ LIB_LDFLAGS={- join(' ', $target{shared_ldflag} || (),
 LIB_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)
 DSO_CPPFLAGS={- join(' ', $target{dso_cppflags} || (),
                           $target{module_cppflags} || (),
+                          (map { '-D'.$_ }
+                               @{$config{dso_defines} || ()},
+                               @{$config{module_defines} || ()}),
                           @{$config{dso_cppflags}},
                           @{$config{module_cppflags}},
                           '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}
@@ -276,6 +279,7 @@ DSO_LDFLAGS={- join(' ', $target{dso_ldflags} || (),
                          '$(CNF_LDFLAGS)', '$(LDFLAGS)') -}
 DSO_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)
 BIN_CPPFLAGS={- join(' ', $target{bin_cppflags} || (),
+                          (map { '-D'.$_ } @{$config{bin_defines} || ()}),
                           @{$config{bin_cppflags}},
                           '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}
 BIN_CFLAGS={- join(' ', $target{bin_cflags} || (),
diff --git a/Configure b/Configure
index 83e7e17..2765639 100755
--- a/Configure
+++ b/Configure
@@ -1415,7 +1415,7 @@ unless ($disabled{asm}) {
 	push @{$config{lib_defines}}, "X25519_ASM";
     }
     if ($target{padlock_asm_src} ne $table{DEFAULTS}->{padlock_asm_src}) {
-	push @{$config{lib_defines}}, "PADLOCK_ASM";
+	push @{$config{dso_defines}}, "PADLOCK_ASM";
     }
     if ($target{poly1305_asm_src} ne "") {
 	push @{$config{lib_defines}}, "POLY1305_ASM";
diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index daf8c94..10b5a05 100644
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -28,7 +28,7 @@
  */
 
 #  undef COMPILE_HW_PADLOCK
-#  if !defined(I386_ONLY) && defined(PADLOCK_ASM)
+#  if defined(PADLOCK_ASM)
 #   define COMPILE_HW_PADLOCK
 #   ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *ENGINE_padlock(void);
@@ -135,7 +135,7 @@ static int padlock_init(ENGINE *e)
  * This stuff is needed if this ENGINE is being compiled into a
  * self-contained shared-library.
  */
-#   ifdef DYNAMIC_ENGINE
+#   ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int padlock_bind_fn(ENGINE *e, const char *id)
 {
     if (id && (strcmp(id, padlock_id) != 0)) {
@@ -151,7 +151,7 @@ static int padlock_bind_fn(ENGINE *e, const char *id)
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(padlock_bind_fn)
-#   endif                       /* DYNAMIC_ENGINE */
+#   endif                       /* !OPENSSL_NO_DYNAMIC_ENGINE */
 /* ===== Here comes the "real" engine ===== */
 
 /* Some AES-related constants */