From: Andy Polyakov <appro@openssl.org>
Date: Mon, 19 Mar 2012 20:20:41 +0000 (+0000)
Subject: eng_all.c: revert previous "disable Padlock" commit, which was unjustified.
X-Git-Tag: master-post-reformat~1898
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=884c580e05c016b99f873cf9ed7acfcd9e6552b8;p=oweals%2Fopenssl.git

eng_all.c: revert previous "disable Padlock" commit, which was unjustified.
---

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 2c8d1869a4..7185eef1e6 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -106,9 +106,9 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_UBSEC
 	ENGINE_load_ubsec();
 #endif
-/*#ifndef OPENSSL_NO_HW_PADLOCK
+#ifndef OPENSSL_NO_HW_PADLOCK
 	ENGINE_load_padlock();
-	#endif*/
+#endif
 #endif
 #ifndef OPENSSL_NO_GOST
 	ENGINE_load_gost();
diff --git a/engines/Makefile b/engines/Makefile
index 4a2969e93d..786716c11b 100644
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -51,6 +51,7 @@ LIBOBJ= e_4758cca.o \
 	e_nuron.o \
 	e_sureware.o \
 	e_ubsec.o \
+	e_padlock.o \
 	e_capi.o \
 	$(ENGINES_ASM_OBJ)