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 2c8d1869a4ccf13ab5b167df5e168d8a9fe2a77c..7185eef1e61629d1357675da8a3af70885c0ec28 100644 (file)
--- 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 4a2969e93dcc10c3c57ba279e231c0ba9afeca13..786716c11b0d3863ad1583884882c96e348d30df 100644 (file)
--- 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)