X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/1da1ed6a5815deef6c33d74f1eb3c856793df3e5..d9d419b020ab2b6fc1b7bdfc8db24735c7f7b6fb:/symm/Makefile.am?ds=sidebyside

diff --git a/symm/Makefile.am b/symm/Makefile.am
index 1d3374f5..ee3d4172 100644
--- a/symm/Makefile.am
+++ b/symm/Makefile.am
@@ -118,7 +118,7 @@ endif
 ## Adams and Tavares' `CAST' block ciphers.
 BLKCS			+= cast128 cast256
 libsymm_la_SOURCES	+= cast-s.c cast-sk.c cast-base.h
-cast256.t$(EXEEXT): t/cast256
+cast256.log: t/cast256
 EXTRA_DIST		+= t/cast256.aes
 MAINTAINERCLEANFILES	+= $(srcdir)/t/cast256
 t/cast256: t/cast256.aes
@@ -160,7 +160,7 @@ $(precomp)/symm/mars-tab.c:
 	$(AM_V_GEN)./mars-mktab >$(precomp)/symm/mars-tab.c.new && \
 		mv $(precomp)/symm/mars-tab.c.new $(precomp)/symm/mars-tab.c
 endif
-mars.t$(EXEEXT): t/mars
+mars.log: t/mars
 EXTRA_DIST		+= t/mars.aes
 MAINTAINERCLEANFILES	+= $(srcdir)/t/mars
 t/mars: t/mars.aes
@@ -188,6 +188,11 @@ endif
 if CPUFAM_AMD64
 libsymm_la_SOURCES	+= rijndael-x86ish-aesni.S
 endif
+if HAVE_AS_ARMV8_CRYPTO
+if CPUFAM_ARMEL
+libsymm_la_SOURCES	+= rijndael-arm-crypto.S
+endif
+endif
 nodist_libsymm_la_SOURCES += ../precomp/symm/rijndael-tab.c
 PRECOMPS		+= $(precomp)/symm/rijndael-tab.c
 PRECOMP_PROGS		+= rijndael-mktab
@@ -199,7 +204,7 @@ $(precomp)/symm/rijndael-tab.c:
 		mv $(precomp)/symm/rijndael-tab.c.new \
 			$(precomp)/symm/rijndael-tab.c
 endif
-rijndael.t$(EXEEXT): t/rijndael
+rijndael.log: t/rijndael
 EXTRA_DIST		+= t/rijndael.aes
 MAINTAINERCLEANFILES	+= $(srcdir)/t/rijndael
 t/rijndael: t/rijndael.aes
@@ -228,7 +233,7 @@ BLKCS			+= serpent
 libsymm_la_SOURCES	+= serpent-sbox.h
 check_PROGRAMS		+= serpent-check
 TESTS			+= serpent-check
-serpent.t$(EXEEXT): t/serpent
+serpent.log: t/serpent
 EXTRA_DIST		+= t/serpent.aes
 MAINTAINERCLEANFILES	+= $(srcdir)/t/serpent
 t/serpent: t/serpent.aes
@@ -273,7 +278,7 @@ $(precomp)/symm/twofish-tab.c:
 		mv $(precomp)/symm/twofish-tab.c.new \
 			$(precomp)/symm/twofish-tab.c
 endif
-twofish.t$(EXEEXT): t/twofish
+twofish.log: t/twofish
 EXTRA_DIST		+= t/twofish.aes
 MAINTAINERCLEANFILES	+= $(srcdir)/t/twofish
 t/twofish: t/twofish.aes
@@ -400,6 +405,9 @@ endif
 if CPUFAM_AMD64
 libsymm_la_SOURCES	+= salsa20-x86ish-sse2.S
 endif
+if CPUFAM_ARMEL
+libsymm_la_SOURCES	+= salsa20-arm-neon.S
+endif
 TESTS			+= salsa20.t$(EXEEXT)
 ALL_CIPHERS		+= salsa20 salsa2012 salsa208
 ALL_CIPHERS		+= xsalsa20 xsalsa2012 xsalsa208
@@ -410,7 +418,7 @@ STUBS_HDR		+= XSalsa20/12,xsalsa2012,salsa20
 STUBS_HDR		+= XSalsa20/8,xsalsa208,salsa20
 EXTRA_DIST		+= t/salsa20
 MAINTAINERCLEANFILES	+= t/salsa20
-salsa20.t$(EXEEXT): t/salsa20
+salsa20.log: t/salsa20
 SALSA20_ESTREAM_TV	 = t/salsa20.estream
 SALSA20_ESTREAM_TV	+= t/salsa2012.estream
 SALSA20_ESTREAM_TV	+= t/salsa208.estream
@@ -432,6 +440,9 @@ endif
 if CPUFAM_AMD64
 libsymm_la_SOURCES	+= chacha-x86ish-sse2.S
 endif
+if CPUFAM_ARMEL
+libsymm_la_SOURCES	+= chacha-arm-neon.S
+endif
 TESTS			+= chacha.t$(EXEEXT)
 EXTRA_DIST		+= t/chacha
 ALL_CIPHERS		+= chacha20 chacha12 chacha8
@@ -443,6 +454,20 @@ STUBS_HDR		+= XChaCha20,xchacha20,chacha
 STUBS_HDR		+= XChaCha12,xchacha12,chacha
 STUBS_HDR		+= XChaCha8,xchacha8,chacha
 
+## Bernstein's `Poly1305' message authentication code.
+pkginclude_HEADERS	+= poly1305.h
+libsymm_la_SOURCES	+= poly1305.c
+TESTS			+= poly1305.t$(EXEEXT)
+TESTS			+= poly1305-p11.t$(EXEEXT)
+EXTRA_DIST		+= t/poly1305
+
+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_LDADD	 = $(TEST_LIBS) $(top_builddir)/libcatacomb.la
+poly1305_p11_t_LDADD	+= $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
+
 ###--------------------------------------------------------------------------
 ### Autogenerated mode implementations.