diff options
| author | appro <appro> | 2012-03-19 20:20:40 +0000 |
|---|---|---|
| committer | appro <appro> | 2012-03-19 20:20:40 +0000 |
| commit | 0602443f62ce02eaa5f085c88af75ddd879c02fa (patch) | |
| tree | bd12349f047466d371775fbe78dd683299964f19 | |
| parent | a6a466d7b6f6d623a8f6e8b597958a039b32c003 (diff) | |
| download | openssl-0602443f62ce02eaa5f085c88af75ddd879c02fa.tar.gz | |
eng_all.c: revert previous "disable Padlock" commit, which was unjustified.
| -rw-r--r-- | crypto/engine/eng_all.c | 4 | ||||
| -rw-r--r-- | engines/Makefile | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c index 2c8d1869a..7185eef1e 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 4a2969e93..786716c11 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) |