Merge branch '2.5.x'

[catacomb] / pub / Makefile.am

diff --git a/pub/Makefile.am b/pub/Makefile.am
index b21d6af..fdab2d7 100644 (file)
--- a/pub/Makefile.am
+++ b/pub/Makefile.am
@@ -98,4 +98,40 @@ EXTRA_DIST           += rsa-test.c
 TESTS                  += rsa-test.t$(EXEEXT)
 EXTRA_DIST             += t/rsa
 
+## Bernstein's X25519 key-agreement algorithm.
+pkginclude_HEADERS     += x25519.h
+libpub_la_SOURCES      += x25519.c
+TESTS                  += x25519.t$(EXEEXT)
+EXTRA_DIST             += t/x25519 t/x25519.slow
+
+## Bernstein's Ed25519 signature algorithm.
+pkginclude_HEADERS     += ed25519.h
+libpub_la_SOURCES      += ed25519.c
+TESTS                  += ed25519.t$(EXEEXT)
+EXTRA_DIST             += t/ed25519 t/ed25519.local
+EXTRA_DIST             += t/ed25519.djb ed25519-tvconv
+MAINTAINERCLEANFILES   += t/ed25519
+ed25519.log: t/ed25519
+t/ed25519: ed25519-tvconv t/ed25519.djb t/ed25519.local
+       $(AM_V_GEN)cd $(srcdir) && \
+               { echo "### GENERATED by ed25519-tvconv" && \
+                 ./ed25519-tvconv k <t/ed25519.djb && \
+                 ./ed25519-tvconv s <t/ed25519.djb && \
+                 ./ed25519-tvconv v <t/ed25519.djb; \
+                 cat t/ed25519.local; \
+               } >t/ed25519.new && \
+               mv t/ed25519.new t/ed25519
+
+## Hamburg's X448 key-agreement algorithm.
+pkginclude_HEADERS     += x448.h
+libpub_la_SOURCES      += x448.c
+TESTS                  += x448.t$(EXEEXT)
+EXTRA_DIST             += t/x448 t/x448.slow
+
+## Ed448: Bernstein's EdDSA over Hamburg's Ed448-Goldilocks curve.
+pkginclude_HEADERS     += ed448.h
+libpub_la_SOURCES      += ed448.c
+TESTS                  += ed448.t$(EXEEXT)
+EXTRA_DIST             += t/ed448
+
 ###----- That's all, folks --------------------------------------------------