X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/ba57d6526b809146b9c22d8f166b51d22e3bdb68..refs/heads/2.3.x:/symm/Makefile.am

diff --git a/symm/Makefile.am b/symm/Makefile.am
index 69c1013f..2c1cc06f 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
@@ -182,6 +182,17 @@ BLKCS			+= rc5
 ## Daemen and Rijmen's `Rijndael' block cipher, selected as AES.
 BLKCS			+= rijndael rijndael192 rijndael256
 libsymm_la_SOURCES	+= rijndael-base.h rijndael-base.c
+if CPUFAM_X86
+libsymm_la_SOURCES	+= rijndael-x86ish-aesni.S
+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
@@ -193,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
@@ -222,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
@@ -267,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
@@ -388,6 +399,15 @@ ALL_CIPHERS		+= seal
 EXTRA_DIST		+= salsa20-tvconv
 pkginclude_HEADERS	+= salsa20.h salsa20-core.h
 libsymm_la_SOURCES	+= salsa20.c
+if CPUFAM_X86
+libsymm_la_SOURCES	+= salsa20-x86ish-sse2.S
+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
@@ -398,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
@@ -414,6 +434,15 @@ t/salsa20: salsa20-tvconv t/salsa20.local $(SALSA20_ESTREAM_TV)
 ## Bernstein's `ChaCha' stream cipher.
 pkginclude_HEADERS	+= chacha.h chacha-core.h
 libsymm_la_SOURCES	+= chacha.c
+if CPUFAM_X86
+libsymm_la_SOURCES	+= chacha-x86ish-sse2.S
+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