提交 e8926acf 编写于 作者: R Richard Levitte

Make the padlock engine build correctly

Reviewed-by: NMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8220)

(cherry picked from commit 149c12d5e41b238ce4af6d1b6b3a767b40293bd7)
上级 5dcfd143
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
*/ */
# undef COMPILE_HW_PADLOCK # undef COMPILE_HW_PADLOCK
# if !defined(I386_ONLY) && defined(PADLOCK_ASM) # if defined(PADLOCK_ASM)
# define COMPILE_HW_PADLOCK # define COMPILE_HW_PADLOCK
# ifdef OPENSSL_NO_DYNAMIC_ENGINE # ifdef OPENSSL_NO_DYNAMIC_ENGINE
static ENGINE *ENGINE_padlock(void); static ENGINE *ENGINE_padlock(void);
...@@ -148,7 +148,7 @@ static int padlock_init(ENGINE *e) ...@@ -148,7 +148,7 @@ static int padlock_init(ENGINE *e)
* This stuff is needed if this ENGINE is being compiled into a * This stuff is needed if this ENGINE is being compiled into a
* self-contained shared-library. * self-contained shared-library.
*/ */
# ifdef DYNAMIC_ENGINE # ifndef OPENSSL_NO_DYNAMIC_ENGINE
static int padlock_bind_fn(ENGINE *e, const char *id) static int padlock_bind_fn(ENGINE *e, const char *id)
{ {
if (id && (strcmp(id, padlock_id) != 0)) { if (id && (strcmp(id, padlock_id) != 0)) {
...@@ -164,7 +164,7 @@ static int padlock_bind_fn(ENGINE *e, const char *id) ...@@ -164,7 +164,7 @@ static int padlock_bind_fn(ENGINE *e, const char *id)
IMPLEMENT_DYNAMIC_CHECK_FN() IMPLEMENT_DYNAMIC_CHECK_FN()
IMPLEMENT_DYNAMIC_BIND_FN(padlock_bind_fn) IMPLEMENT_DYNAMIC_BIND_FN(padlock_bind_fn)
# endif /* DYNAMIC_ENGINE */ # endif /* !OPENSSL_NO_DYNAMIC_ENGINE */
/* ===== Here comes the "real" engine ===== */ /* ===== Here comes the "real" engine ===== */
/* Some AES-related constants */ /* Some AES-related constants */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册