Commit 884c580e authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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

parent bbbe61c9

crypto/engine/eng_all.c

+2 −2
Original line number Diff line number Diff line
@@ -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();

engines/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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)