Commit 149c12d5 authored by Richard Levitte's avatar Richard Levitte
Browse files

Make the padlock engine build correctly 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8220)
parent 2fce15b5

engines/e_padlock.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */