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 2c1cc06..c30fd7e 100644 (file)
--- a/symm/Makefile.am
+++ b/symm/Makefile.am
@@ -410,9 +410,13 @@ 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
@@ -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.