eng_all.c: revert previous "disable Padlock" commit, which was unjustified.
authorAndy Polyakov <appro@openssl.org>
Mon, 19 Mar 2012 20:20:41 +0000 (20:20 +0000)
committerAndy Polyakov <appro@openssl.org>
Mon, 19 Mar 2012 20:20:41 +0000 (20:20 +0000)
crypto/engine/eng_all.c
engines/Makefile

index 2c8d186..7185eef 100644 (file)
@@ -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();
index 4a2969e..786716c 100644 (file)
@@ -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)