symm/{chacha,salsa20}.[ch]: Support RFC7539-style 96-bit nonces.

[catacomb] / symm / Makefile.am

diff --git a/symm/Makefile.am b/symm/Makefile.am
index 4539e0a..c30fd7e 100644 (file)
--- 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
@@ -204,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
@@ -233,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
@@ -278,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
@@ -410,15 +410,19 @@ libsymm_la_SOURCES        += salsa20-arm-neon.S
 endif
 TESTS                  += salsa20.t$(EXEEXT)
 ALL_CIPHERS            += salsa20 salsa2012 salsa208
+ALL_CIPHERS            += salsa20-ietf salsa2012-ietf salsa208-ietf
 ALL_CIPHERS            += xsalsa20 xsalsa2012 xsalsa208
 STUBS_HDR              += Salsa20/12,salsa2012,salsa20
 STUBS_HDR              += Salsa20/8,salsa208,salsa20
+STUBS_HDR              += Salsa20-IETF,salsa20-ietf,salsa20
+STUBS_HDR              += Salsa20/12-IETF,salsa2012-ietf,salsa20
+STUBS_HDR              += Salsa20/8-IETF,salsa208-ietf,salsa20
 STUBS_HDR              += XSalsa20,xsalsa20,salsa20
 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
@@ -446,14 +450,32 @@ endif
 TESTS                  += chacha.t$(EXEEXT)
 EXTRA_DIST             += t/chacha
 ALL_CIPHERS            += chacha20 chacha12 chacha8
+ALL_CIPHERS            += chacha20-ietf chacha12-ietf chacha8-ietf
 ALL_CIPHERS            += xchacha20 xchacha12 xchacha8
 STUBS_HDR              += ChaCha20,chacha20,chacha
 STUBS_HDR              += ChaCha12,chacha12,chacha
 STUBS_HDR              += ChaCha8,chacha8,chacha
+STUBS_HDR              += ChaCha20-IETF,chacha20-ietf,chacha
+STUBS_HDR              += ChaCha12-IETF,chacha12-ietf,chacha
+STUBS_HDR              += ChaCha8-IETF,chacha8-ietf,chacha
 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.