Compile in gost engine.

This commit is contained in:
Dr. Stephen Henson 2006-09-21 13:07:57 +00:00
parent 926c41bd29
commit ffa5ebf3f4
2 changed files with 22 additions and 3 deletions

View File

@ -98,6 +98,9 @@ void ENGINE_load_builtin_engines(void)
#ifndef OPENSSL_NO_HW_PADLOCK #ifndef OPENSSL_NO_HW_PADLOCK
ENGINE_load_padlock(); ENGINE_load_padlock();
#endif #endif
#ifndef OPENSSL_NO_GOST
ENGINE_load_gost();
#endif
#endif #endif
#if defined(__OpenBSD__) || defined(__FreeBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__)
ENGINE_load_cryptodev(); ENGINE_load_cryptodev();

View File

@ -9,6 +9,12 @@ INCLUDES= -I../include
CFLAG=-g CFLAG=-g
MAKEFILE= Makefile MAKEFILE= Makefile
AR= ar r AR= ar r
EDIRS= ccgost
RECURSIVE_MAKE= [ -n "$(EDIRS)" ] && for i in $(EDIRS) ; do \
(cd $$i && echo "making $$target in $(DIR)/$$i..." && \
$(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \
done;
PEX_LIBS= PEX_LIBS=
EX_LIBS= EX_LIBS=
@ -61,7 +67,7 @@ top:
all: lib all: lib
lib: $(LIBOBJ) lib: $(LIBOBJ) subdirs
@if [ -n "$(SHARED_LIBS)" ]; then \ @if [ -n "$(SHARED_LIBS)" ]; then \
set -e; \ set -e; \
for l in $(LIBNAMES); do \ for l in $(LIBNAMES); do \
@ -76,10 +82,16 @@ lib: $(LIBOBJ)
fi; \ fi; \
touch lib touch lib
subdirs:
echo $(EDIRS)
@target=all; $(RECURSIVE_MAKE)
files: files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@target=files; $(RECURSIVE_MAKE)
links: links:
@target=links; $(RECURSIVE_MAKE)
# XXXXX This currently only works on systems that use .so as suffix # XXXXX This currently only works on systems that use .so as suffix
# for shared libraries as well as for Cygwin which uses the # for shared libraries as well as for Cygwin which uses the
@ -107,6 +119,7 @@ install:
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \
done; \ done; \
fi fi
@target=install; $(RECURSIVE_MAKE)
tags: tags:
ctags $(SRC) ctags $(SRC)
@ -121,20 +134,23 @@ tests:
lint: lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff lint -DLINT $(INCLUDES) $(SRC)>fluff
@target=lint; $(RECURSIVE_MAKE)
depend: depend:
@if [ -z "$(THIS)" ]; then \ @if [ -z "$(THIS)" ]; then \
$(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \ $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
else \
$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC); \
fi fi
@[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
@[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
dclean: dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
mv -f Makefile.new $(MAKEFILE) mv -f Makefile.new $(MAKEFILE)
@target=dclean; $(RECURSIVE_MAKE)
clean: clean:
rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
@target=clean; $(RECURSIVE_MAKE)
# DO NOT DELETE THIS LINE -- make depend depends on it. # DO NOT DELETE THIS LINE -- make depend depends on it.