diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-02-13 04:23:14 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-02-27 11:32:14 +0100 |
| commit | 149c12d5e41b238ce4af6d1b6b3a767b40293bd7 (patch) | |
| tree | 3ebea5deda02d75700bcaaac777d819ef5cd9992 /engines | |
| parent | Ensure configured module specific and application specific defines are used (diff) | |
| download | openssl-149c12d5e41b238ce4af6d1b6b3a767b40293bd7.tar.xz openssl-149c12d5e41b238ce4af6d1b6b3a767b40293bd7.zip | |
Make the padlock engine build correctly
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8220)
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_padlock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/e_padlock.c b/engines/e_padlock.c index daf8c94ceb..10b5a05ce8 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 */ |