From: Ben Laurie <ben@openssl.org>
Date: Tue, 13 Dec 2011 15:56:40 +0000 (+0000)
Subject: Padlock engine doesn't build (the asm parts are not built for some reason),
X-Git-Tag: master-post-reformat~2042
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=b9ef708e408ebd6ebb248d679efe416c46fb3f51

Padlock engine doesn't build (the asm parts are not built for some reason),
so remove for now.
---

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 7185eef1e6..2c8d1869a4 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 786716c11b..4a2969e93d 100644
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -51,7 +51,6 @@ LIBOBJ= e_4758cca.o \
 	e_nuron.o \
 	e_sureware.o \
 	e_ubsec.o \
-	e_padlock.o \
 	e_capi.o \
 	$(ENGINES_ASM_OBJ)