diff options
| author | Matt Caswell <matt@openssl.org> | 2016-03-17 12:20:56 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-03-18 12:09:27 +0000 |
| commit | a57bfe43e33f5e7e9dec034796c301fa0628a4b7 (patch) | |
| tree | e0f4ee3561372949b442e60cce9599ff4004a4ce /engines/e_padlock.c | |
| parent | 114de5b59502e1764c14082e14f07562ad4e6a15 (diff) | |
Resolved unresolved symbols with no-hw
Compiling on Windows with no-hw was resulting in unresolved symbols
in the padlock engine.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'engines/e_padlock.c')
| -rw-r--r-- | engines/e_padlock.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/engines/e_padlock.c b/engines/e_padlock.c index 99ac05981a..c5377b55bb 100644 --- a/engines/e_padlock.c +++ b/engines/e_padlock.c @@ -230,7 +230,7 @@ static int padlock_bind_fn(ENGINE *e, const char *id) } IMPLEMENT_DYNAMIC_CHECK_FN() - IMPLEMENT_DYNAMIC_BIND_FN(padlock_bind_fn) +IMPLEMENT_DYNAMIC_BIND_FN(padlock_bind_fn) # endif /* DYNAMIC_ENGINE */ /* ===== Here comes the "real" engine ===== */ # ifndef OPENSSL_NO_AES @@ -798,8 +798,13 @@ static RAND_METHOD padlock_rand = { padlock_rand_status, /* rand status */ }; -# else /* !COMPILE_HW_PADLOCK */ -# ifndef OPENSSL_NO_DYNAMIC_ENGINE +# endif /* COMPILE_HW_PADLOCK */ +# endif /* !OPENSSL_NO_HW_PADLOCK */ +#endif /* !OPENSSL_NO_HW */ + +#if defined(OPENSSL_NO_HW) || defined(OPENSSL_NO_HW_PADLOCK) \ + || !defined(COMPILE_HW_PADLOCK) +# ifndef OPENSSL_NO_DYNAMIC_ENGINE OPENSSL_EXPORT int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); OPENSSL_EXPORT @@ -809,7 +814,5 @@ OPENSSL_EXPORT } IMPLEMENT_DYNAMIC_CHECK_FN() -# endif -# endif /* COMPILE_HW_PADLOCK */ -# endif /* !OPENSSL_NO_HW_PADLOCK */ -#endif /* !OPENSSL_NO_HW */ +# endif +#endif |