generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andy Polyakov 2012-03-19 20:20:41 +00:00
parent bbbe61c958
commit 884c580e05
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/engine/eng_all.c
View File

@ -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();

1
engines/Makefile
View File

@ -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)