summaryrefslogtreecommitdiffstats
path: root/crypto/engine/eng_all.c
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2012-03-19 20:20:41 +0000
committerAndy Polyakov <appro@openssl.org>2012-03-19 20:20:41 +0000
commit884c580e05c016b99f873cf9ed7acfcd9e6552b8 (patch)
treeb8e463760c5c0b8fed37445d4da394159dcec69a /crypto/engine/eng_all.c
parentbbbe61c95872f094a46fc81942c8f6fba1846de9 (diff)
eng_all.c: revert previous "disable Padlock" commit, which was unjustified.
Diffstat (limited to 'crypto/engine/eng_all.c')
-rw-r--r--crypto/engine/eng_all.c4
1 files changed, 2 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();