summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2012-03-19 21:20:41 +0100
committerAndy Polyakov <appro@openssl.org>2012-03-19 21:20:41 +0100
commit884c580e05c016b99f873cf9ed7acfcd9e6552b8 (patch)
treeb8e463760c5c0b8fed37445d4da394159dcec69a
parentAlways use SSLv23_{client,server}_method in s_client.c and s_server.c, (diff)
downloadopenssl-884c580e05c016b99f873cf9ed7acfcd9e6552b8.tar.xz
openssl-884c580e05c016b99f873cf9ed7acfcd9e6552b8.zip
eng_all.c: revert previous "disable Padlock" commit, which was unjustified.
-rw-r--r--crypto/engine/eng_all.c4
-rw-r--r--engines/Makefile1
2 files changed, 3 insertions, 2 deletions
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)