X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/9e6a4409d58d1ed9dfe2de3c6ffaee822e051c9f..b26c78631d7d8a991d60876035ef68bb904d4684:/symm/Makefile.am

diff --git a/symm/Makefile.am b/symm/Makefile.am
index a4f45e9d..68d9267a 100644
--- a/symm/Makefile.am
+++ b/symm/Makefile.am
@@ -593,6 +593,7 @@ check_PROGRAMS		+= poly1305-p11.t
 poly1305_p11_t_SOURCES	 = poly1305.c
 poly1305_p11_t_CPPFLAGS	 = $(AM_CPPFLAGS) -DTEST_RIG -DSRCDIR="\"$(srcdir)\""
 poly1305_p11_t_CPPFLAGS	+= -DPOLY1305_IMPL=11
+poly1305_p11_t_LDFLAGS	 = $(TEST_LDFLAGS)
 poly1305_p11_t_LDADD	 = $(TEST_LIBS) $(top_builddir)/libcatacomb.la
 poly1305_p11_t_LDADD	+= $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
 
@@ -604,12 +605,21 @@ libsymmtest_la_SOURCES	+= latinpoly-test.c latinpoly-test.h
 ALL_AEADS		+= chacha20-poly1305 salsa20-poly1305
 ALL_AEADS		+= chacha12-poly1305 salsa2012-poly1305
 ALL_AEADS		+= chacha8-poly1305 salsa208-poly1305
+ALL_AEADS		+= chacha20-naclbox salsa20-naclbox
+ALL_AEADS		+= chacha12-naclbox salsa2012-naclbox
+ALL_AEADS		+= chacha8-naclbox salsa208-naclbox
 STUBS_HDR		+= ChaCha20-Poly1305,chacha20-poly1305,latinpoly
 STUBS_HDR		+= ChaCha12-Poly1305,chacha12-poly1305,latinpoly
 STUBS_HDR		+= ChaCha8-Poly1305,chacha8-poly1305,latinpoly
 STUBS_HDR		+= Salsa20-Poly1305,salsa20-poly1305,latinpoly
 STUBS_HDR		+= Salsa20/12-Poly1305,salsa2012-poly1305,latinpoly
 STUBS_HDR		+= Salsa20/8-Poly1305,salsa208-poly1305,latinpoly
+STUBS_HDR		+= ChaCha20-NaClBox,chacha20-naclbox,latinpoly
+STUBS_HDR		+= ChaCha12-NaClBox,chacha12-naclbox,latinpoly
+STUBS_HDR		+= ChaCha8-NaClBox,chacha8-naclbox,latinpoly
+STUBS_HDR		+= Salsa20-NaClBox,salsa20-naclbox,latinpoly
+STUBS_HDR		+= Salsa20/12-NaClBox,salsa2012-naclbox,latinpoly
+STUBS_HDR		+= Salsa20/8-NaClBox,salsa208-naclbox,latinpoly
 TESTS			+= chacha-poly1305.t$(EXEEXT)
 TESTS			+= salsa20-poly1305.t$(EXEEXT)