symm/seal.c: Spruce up a bit.

[catacomb] / symm / Makefile.am

diff --git a/symm/Makefile.am b/symm/Makefile.am
index 4441ecc..3db9f3f 100644 (file)
--- a/symm/Makefile.am
+++ b/symm/Makefile.am
@@ -32,6 +32,11 @@ nodist_libsymm_la_SOURCES =
 
 TEST_LIBS               = libsymm.la
 
+noinst_LTLIBRARIES     += libsymmtest.la
+libsymmtest_la_SOURCES  =
+libsymmtest_la_CFLAGS   = $(AM_CFLAGS) -DSRCDIR=\"$(srcdir)\"
+TEST_LIBS              += libsymmtest.la
+
 VPATH                  += $(srcdir)/modes
 
 ###--------------------------------------------------------------------------
@@ -193,6 +198,9 @@ if CPUFAM_ARMEL
 libsymm_la_SOURCES     += rijndael-arm-crypto.S
 endif
 endif
+if CPUFAM_ARM64
+libsymm_la_SOURCES     += rijndael-arm64-crypto.S
+endif
 nodist_libsymm_la_SOURCES += ../precomp/symm/rijndael-tab.c
 PRECOMPS               += $(precomp)/symm/rijndael-tab.c
 PRECOMP_PROGS          += rijndael-mktab
@@ -477,6 +485,9 @@ endif
 if CPUFAM_ARMEL
 libsymm_la_SOURCES     += salsa20-arm-neon.S
 endif
+if CPUFAM_ARM64
+libsymm_la_SOURCES     += salsa20-arm64.S
+endif
 TESTS                  += salsa20.t$(EXEEXT)
 ALL_CIPHERS            += salsa20 salsa2012 salsa208
 ALL_CIPHERS            += salsa20-ietf salsa2012-ietf salsa208-ietf
@@ -516,6 +527,9 @@ endif
 if CPUFAM_ARMEL
 libsymm_la_SOURCES     += chacha-arm-neon.S
 endif
+if CPUFAM_ARM64
+libsymm_la_SOURCES     += chacha-arm64.S
+endif
 TESTS                  += chacha.t$(EXEEXT)
 EXTRA_DIST             += t/chacha
 ALL_CIPHERS            += chacha20 chacha12 chacha8
@@ -583,6 +597,9 @@ MAINTAINERCLEANFILES        += $(GENMODES_H)
 pkginclude_HEADERS     += $(GENMODES_H)
 $(GENMODES_H): modes/gen-stamp
 
+## Additional test machinery.
+libsymmtest_la_SOURCES += modes-test.c modes-test.h
+
 ###--------------------------------------------------------------------------
 ### Autogenerated stub headers.
 
@@ -640,9 +657,13 @@ gmactab.c: gthingtab.c.in Makefile.am
 ## Run the test programs.
 TESTS                  += $(SYMM_TESTS)
 EXTRA_DIST             += $(SYMM_TEST_FILES)
+EXTRA_DIST             += $(REGRESSION_TEST_FILES)
 
-## A piece of sample text for round-trip testing encryption modes.
-EXTRA_DIST             += daftstory.h
+t/modes/%.regress:
+       $(MAKE) modes/$*.t && \
+               mkdir -p $(srcdir)/t/modes/ && \
+               modes/$*.t -o$(srcdir)/$@.new && \
+               mv $(srcdir)/$@.new $(srcdir)/$@
 
 ## Clean the debris from the `modes' subdirectory.
 CLEANFILES             += modes/*.to modes/*.t$(EXEEXT)