提交 884c580e 编写于 作者: A Andy Polyakov

eng_all.c: revert previous "disable Padlock" commit, which was unjustified.

上级 bbbe61c9
...@@ -106,9 +106,9 @@ void ENGINE_load_builtin_engines(void) ...@@ -106,9 +106,9 @@ void ENGINE_load_builtin_engines(void)
#ifndef OPENSSL_NO_HW_UBSEC #ifndef OPENSSL_NO_HW_UBSEC
ENGINE_load_ubsec(); ENGINE_load_ubsec();
#endif #endif
/*#ifndef OPENSSL_NO_HW_PADLOCK #ifndef OPENSSL_NO_HW_PADLOCK
ENGINE_load_padlock(); ENGINE_load_padlock();
#endif*/ #endif
#endif #endif
#ifndef OPENSSL_NO_GOST #ifndef OPENSSL_NO_GOST
ENGINE_load_gost(); ENGINE_load_gost();
......
...@@ -51,6 +51,7 @@ LIBOBJ= e_4758cca.o \ ...@@ -51,6 +51,7 @@ LIBOBJ= e_4758cca.o \
e_nuron.o \ e_nuron.o \
e_sureware.o \ e_sureware.o \
e_ubsec.o \ e_ubsec.o \
e_padlock.o \
e_capi.o \ e_capi.o \
$(ENGINES_ASM_OBJ) $(ENGINES_ASM_OBJ)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册