aboutsummaryrefslogtreecommitdiffstats
path: root/engines/e_padlock.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2019-05-28 20:08:17 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2019-05-28 20:08:17 +0000
commit375b8e6770f750fb915859470f6f1fe43f35cc48 (patch)
tree5db6744924edfc112439ad2366f52f246baa21d1 /engines/e_padlock.c
parent851f7386fd78b9787f4f6669ad271886a2a003f1 (diff)
downloadsrc-375b8e6770f750fb915859470f6f1fe43f35cc48.tar.gz
src-375b8e6770f750fb915859470f6f1fe43f35cc48.zip
Import OpenSSL 1.1.1c.vendor/openssl/1.1.1c
Notes
Notes: svn path=/vendor-crypto/openssl/dist/; revision=348333 svn path=/vendor-crypto/openssl/1.1.1c/; revision=348334; tag=vendor/openssl/1.1.1c
Diffstat (limited to 'engines/e_padlock.c')
-rw-r--r--engines/e_padlock.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index f6b1f169810e..a82c07e81373 100644
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2019 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -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 */