X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/0f00dc4c8eb47e67bc0f148c2dd109f73a451e0a..HEAD:/pub/Makefile.am

diff --git a/pub/Makefile.am b/pub/Makefile.am
index d919edf2..fdab2d7a 100644
--- a/pub/Makefile.am
+++ b/pub/Makefile.am
@@ -39,9 +39,9 @@ pkginclude_HEADERS	+= bbs.h
 libpub_la_SOURCES	+= bbs-fetch.c
 libpub_la_SOURCES	+= bbs-gen.c
 libpub_la_SOURCES	+= bbs-jump.c
-TESTS			+= bbs-jump.$t
+TESTS			+= bbs-jump.t$(EXEEXT)
 libpub_la_SOURCES	+= bbs-rand.c
-TESTS			+= bbs-rand.$t
+TESTS			+= bbs-rand.t$(EXEEXT)
 EXTRA_DIST		+= t/bbs
 
 ## Plain Diffie--Hellman, in Schorr groups.
@@ -52,30 +52,30 @@ libpub_la_SOURCES	+= dh-gen.c
 libpub_la_SOURCES	+= dh-kcdsa.c
 libpub_la_SOURCES	+= dh-limlee.c
 libpub_la_SOURCES	+= dh-param.c
-TESTS			+= dh-param.$t
+TESTS			+= dh-param.t$(EXEEXT)
 
 ## The National Security Agency's Digital Signature Algorithm.
 pkginclude_HEADERS	+= dsa.h
 libpub_la_SOURCES	+= dsa-gen.c
-TESTS			+= dsa-gen.$t
+TESTS			+= dsa-gen.t$(EXEEXT)
 libpub_la_SOURCES	+= dsa-misc.c
 libpub_la_SOURCES	+= dsa-sign.c
-TESTS			+= dsa-sign.$t
+TESTS			+= dsa-sign.t$(EXEEXT)
 libpub_la_SOURCES	+= dsa-verify.c
-TESTS			+= dsa-verify.$t
+TESTS			+= dsa-verify.t$(EXEEXT)
 libpub_la_SOURCES	+= dsa-check.c
 EXTRA_DIST		+= t/dsa
 
 ## Generalization of DSA to arbitrary cyclic groups.
 pkginclude_HEADERS	+= gdsa.h
 libpub_la_SOURCES	+= gdsa.c
-TESTS			+= gdsa.$t
+TESTS			+= gdsa.t$(EXEEXT)
 EXTRA_DIST		+= t/gdsa
 
 ## KISA `KCDSA', generalized to arbitrary cyclic groups.
 pkginclude_HEADERS	+= gkcdsa.h
 libpub_la_SOURCES	+= gkcdsa.c
-TESTS			+= gkcdsa.$t
+TESTS			+= gkcdsa.t$(EXEEXT)
 EXTRA_DIST		+= t/gkcdsa
 
 ## General key validity checking machinery.
@@ -95,7 +95,43 @@ libpub_la_SOURCES	+= oaep.c
 libpub_la_SOURCES	+= pkcs1.c
 libpub_la_SOURCES	+= pss.c
 EXTRA_DIST		+= rsa-test.c
-TESTS			+= rsa-test.$t
+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 --------------------------------------------------