1

tests/Makefile.am

@@ -3,7 +3,6 @@
 # All available tests
 check_PROGRAMS = \
 	test_etcp_crypto \
-	test_crypto \
 	test_etcp_two_instances \
 	test_etcp_simple_traffic \
 	test_etcp_minimal \
@@ -26,6 +25,12 @@ check_PROGRAMS = \
 	bench_timeout_heap \
 	bench_uasync_timeouts
 
+# test_crypto only needed for TinyCrypt (not when using OpenSSL)
+if USE_OPENSSL
+else
+check_PROGRAMS += test_crypto
+endif
+
 # Basic includes
 AM_CFLAGS = -g -I$(top_srcdir)/src -I$(top_srcdir)/lib -I$(top_srcdir)/tinycrypt/lib/include -I$(top_srcdir)/tinycrypt/lib/source
 
@@ -105,23 +110,33 @@ endif
 # Register tests
 TESTS = $(check_PROGRAMS)
 
-# Build TinyCrypt objects as a group
+# Build TinyCrypt objects as a group (only when not using OpenSSL)
+if USE_OPENSSL
+else
 tinycrypt-objects: $(TINYCRYPT_OBJS)
+endif
 
 # Ensure TinyCrypt objects are built before tests that need them
+if USE_OPENSSL
+BUILT_SOURCES =
+else
 BUILT_SOURCES = $(TINYCRYPT_OBJS)
 
 $(TINYCRYPT_OBJS): $(top_builddir)/src/utun
 	@$(MAKE) -C $(top_builddir)/src tinycrypt-objects
+endif
 
 # Test definitions
 test_etcp_crypto_SOURCES = test_etcp_crypto.c
 test_etcp_crypto_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib -I$(top_srcdir)/tinycrypt/lib/include -I$(top_srcdir)/tinycrypt/lib/source
 test_etcp_crypto_LDADD = $(SECURE_CHANNEL_OBJS) $(CRYPTO_LIBS) $(COMMON_LIBS)
 
+if USE_OPENSSL
+else
 test_crypto_SOURCES = test_crypto.c
 test_crypto_CFLAGS = -I$(top_srcdir)/tinycrypt/lib/include -I$(top_srcdir)/tinycrypt/lib/source -I$(top_srcdir)/lib
 test_crypto_LDADD = $(TINYCRYPT_OBJS) $(COMMON_LIBS)
+endif
 
 test_etcp_two_instances_SOURCES = test_etcp_two_instances.c
 test_etcp_two_instances_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib -I$(top_srcdir)/tinycrypt/lib/include -I$(top_srcdir)/tinycrypt/lib/source
@@ -145,7 +160,7 @@ test_pkt_normalizer_etcp_LDADD = $(ETCP_FULL_OBJS) $(SECURE_CHANNEL_OBJS) $(CRYP
 
 test_pkt_normalizer_standalone_SOURCES = test_pkt_normalizer_standalone.c
 test_pkt_normalizer_standalone_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib -I$(top_srcdir)/tinycrypt/lib/include -I$(top_srcdir)/tinycrypt/lib/source
-test_pkt_normalizer_standalone_LDADD = $(top_builddir)/src/utun-pkt_normalizer.o $(top_builddir)/src/utun-route_lib.o $(top_builddir)/src/utun-routing.o $(top_builddir)/src/utun-packet_dump.o $(top_builddir)/src/utun-etcp_api.o $(TINYCRYPT_OBJS) $(COMMON_LIBS)
+test_pkt_normalizer_standalone_LDADD = $(top_builddir)/src/utun-pkt_normalizer.o $(top_builddir)/src/utun-route_lib.o $(top_builddir)/src/utun-routing.o $(top_builddir)/src/utun-packet_dump.o $(top_builddir)/src/utun-etcp_api.o $(CRYPTO_LIBS) $(COMMON_LIBS)
 
 test_etcp_api_SOURCES = test_etcp_api.c
 test_etcp_api_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib -I$(top_srcdir)/tinycrypt/lib/include -I$(top_srcdir)/tinycrypt/lib/source
@@ -157,7 +172,7 @@ test_ll_queue_LDADD = $(COMMON_LIBS)
 
 test_ecc_encrypt_SOURCES = test_ecc_encrypt.c
 test_ecc_encrypt_CFLAGS = -I$(top_srcdir)/tinycrypt/lib/include -I$(top_srcdir)/tinycrypt/lib/source -I$(top_srcdir)/lib
-test_ecc_encrypt_LDADD = $(SECURE_CHANNEL_OBJS) $(TINYCRYPT_OBJS) $(COMMON_LIBS) -lcrypto
+test_ecc_encrypt_LDADD = $(SECURE_CHANNEL_OBJS) $(CRYPTO_LIBS) $(COMMON_LIBS) -lcrypto
 
 test_intensive_memory_pool_SOURCES = test_intensive_memory_pool.c
 test_intensive_memory_pool_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib