diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-08-10 10:46:27 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-08-11 20:27:46 +0100 |
| commit | c0cbb4c19bb6e22b338dd17c096be323f7414faf (patch) | |
| tree | fb69e70b5e3cfd36962384657ed3796dc6ca8480 /engines | |
| parent | c2a34c58f56980b80f034e8295210146b5c247c3 (diff) | |
Use dynamic engine for libssl test harness
Use a dynamic engine for ossltest engine so that we can build it without
subsequently deploying it during install. We do not want people accidentally
using this engine.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/Makefile | 17 | ||||
| -rw-r--r-- | engines/e_ossltest.c | 6 |
2 files changed, 12 insertions, 11 deletions
diff --git a/engines/Makefile b/engines/Makefile index c0b7c03493..8b9e38b1e9 100644 --- a/engines/Makefile +++ b/engines/Makefile @@ -31,20 +31,21 @@ AFLAGS= $(ASFLAGS) GENERAL=Makefile engines.com install.com engine_vector.mar LIB=$(TOP)/libcrypto.a -LIBNAMES= 4758cca gmp padlock capi ossltest - +LIBNAMES= 4758cca gmp padlock capi LIBSRC= e_4758cca.c \ e_gmp.c \ e_padlock.c \ - e_capi.c \ - e_ossltest.c + e_capi.c LIBOBJ= e_4758cca.o \ e_gmp.o \ e_padlock.o \ e_capi.o \ - e_ossltest.o \ $(ENGINES_ASM_OBJ) +TESTLIBNAMES= ossltest +TESTLIBSRC= e_ossltest.c +TESTLIBOBJ= e_ossltest.o + SRC= $(LIBSRC) HEADER= e_4758cca_err.c e_4758cca_err.h \ @@ -63,10 +64,10 @@ top: all: lib subdirs -lib: $(LIBOBJ) +lib: $(LIBOBJ) $(TESTLIBOBJ) @if [ -n "$(SHARED_LIBS)" ]; then \ set -e; \ - for l in $(LIBNAMES); do \ + for l in $(LIBNAMES) $(TESTLIBNAMES); do \ $(MAKE) -f ../Makefile.shared -e \ LIBNAME=$$l LIBEXTRAS="e_$$l*.o" \ LIBDEPS='-L.. -lcrypto $(EX_LIBS)' \ @@ -145,7 +146,7 @@ depend: local_depend @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) ) local_depend: - @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) + @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) $(TESTLIBSRC) dclean: $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new diff --git a/engines/e_ossltest.c b/engines/e_ossltest.c index 689e5321ca..6e50a5fcea 100644 --- a/engines/e_ossltest.c +++ b/engines/e_ossltest.c @@ -257,7 +257,7 @@ static int bind_ossltest(ENGINE *e) return 1; } -#ifdef ENGINE_DYNAMIC_SUPPORT +#ifndef OPENSSL_NO_DYNAMIC_ENGINE static int bind_helper(ENGINE *e, const char *id) { if (id && (strcmp(id, engine_ossltest_id) != 0)) @@ -269,7 +269,8 @@ static int bind_helper(ENGINE *e, const char *id) IMPLEMENT_DYNAMIC_CHECK_FN() IMPLEMENT_DYNAMIC_BIND_FN(bind_helper) -#else +#endif + static ENGINE *engine_ossltest(void) { ENGINE *ret = ENGINE_new(); @@ -292,7 +293,6 @@ void ENGINE_load_ossltest(void) ENGINE_free(toadd); ERR_clear_error(); } -#endif static int ossltest_init(ENGINE *e) |