From e8926acfe25418d029656d4abb321096a2cf17c5 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 13 Feb 2019 04:23:14 +0100 Subject: [PATCH] Make the padlock engine build correctly Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/8220) (cherry picked from commit 149c12d5e41b238ce4af6d1b6b3a767b40293bd7) --- engines/e_padlock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engines/e_padlock.c b/engines/e_padlock.c index f6b1f16981..f6c21596e3 100644 --- a/engines/e_padlock.c +++ b/engines/e_padlock.c @@ -41,7 +41,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); @@ -148,7 +148,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)) { @@ -164,7 +164,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 */ -- 2.25.1