X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/0bcb8184cfce875a4dde57621139dd44c433f3a5..refs/heads/mdw/xdh:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d31d44e..ab70bd6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,9 +61,10 @@ TARGETS:=secnet
 OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
 	resolver.o random.o udp.o site.o transform-cbcmac.o transform-eax.o \
 	comm-common.o polypath.o \
-	netlink.o rsa.o dh.o serpent.o serpentbe.o \
-	f25519.o x25519.o fgoldi.o x448.o \
-	md5.o sha512.o tun.o slip.o sha1.o ipaddr.o log.o \
+	netlink.o rsa.o dh.o xdh.o serpent.o serpentbe.o \
+	scaf.o f25519.o x25519.o ed25519.o fgoldi.o x448.o ed448.o \
+	md5.o sha512.o keccak1600.o sha3.o \
+	tun.o slip.o sha1.o ipaddr.o log.o \
 	process.o @LIBOBJS@ \
 	hackypar.o
 # version.o is handled specially below and in the link rule for secnet.
@@ -144,9 +145,12 @@ secnet: Makefile .git/HEAD $(shell sed -n 's#^ref: #.git/#p' .git/HEAD)
 secnet: $(wildcard .git/packed-refs)
 endif
 
+CRYPTO_TESTS = keccak1600 sha3 f25519 x25519 ed25519 fgoldi x448 ed448
+
 check: eax-aes-test.confirm eax-serpent-test.confirm \
 	eax-serpentbe-test.confirm check-ipaddrset \
-	msgcode-test.confirm x25519-test.confirm x448-test.confirm
+	msgcode-test.confirm \
+	$(foreach c,$(CRYPTO_TESTS),$c-test.confirm)
 
 version.c: Makefile
 	echo "#include \"secnet.h\"" >$@.new
@@ -173,24 +177,32 @@ msgcode-test.confirm: msgcode-test
 	./msgcode-test
 	touch $@
 
-XDH_FUNCS = x25519 x448
-x25519_FIELD = f25519
-x448_FIELD = fgoldi
-
-$(addsuffix -test, $(XDH_FUNCS)): %-test: %-test.o %.o
+$(foreach c,$(CRYPTO_TESTS),$c-test): %-test: %-test.o crypto-test.o
 	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
-x25519-test: f25519.o
-x448-test: fgoldi.o
 
-$(addsuffix -test.o, $(XDH_FUNCS)): %-test.o: xdh-test.c
-	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c \
-		-DXDH=$* -DFIELD=$($*_FIELD) \
-		$< -o $@
-
-$(addsuffix -test.confirm, $(XDH_FUNCS)): %-test.confirm: %-test %-tests.in
+$(foreach c,$(CRYPTO_TESTS),$c-test.confirm): \
+		%-test.confirm: %-test %-tests.in
 	./$*-test <$(srcdir)/$*-tests.in
 	touch $@
 
+keccak1600-test: keccak1600.o
+sha3-test: sha3.o keccak1600.o
+f25519-test: f25519.o
+x25519-test: x25519.o f25519.o
+ed25519-test: sha512.o f25519.o scaf.o ed25519.o
+fgoldi-test: fgoldi.o
+x448-test: x448.o fgoldi.o
+ed448-test: keccak1600.o sha3.o fgoldi.o scaf.o ed448.o
+
+f25519-test.o: ec-field-test.c
+	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c -DFIELD=f25519 $< -o $@
+fgoldi-test.o: ec-field-test.c
+	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c -DFIELD=fgoldi $< -o $@
+x25519-test.o: xdh-test.c
+	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c -DXDH=x25519 -DFIELD=f25519 $< -o $@
+x448-test.o: xdh-test.c
+	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c -DXDH=x448 -DFIELD=fgoldi $< -o $@
+
 check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
 	$(srcdir)/ipaddrset-test.py >ipaddrset-test.new
 	diff -u $(srcdir)/ipaddrset-test.expected ipaddrset-test.new
@@ -226,8 +238,8 @@ clean:
 	$(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
 	$(RM) -f *.d *.pyc *~ eax-*-test.confirm eax-*-test
 	$(RM) -f msgcode-test.confirm msgcode-test
-	$(RM) -f $(addsuffix -test, $(XDH_FUNCS))
-	$(RM) -f $(addsuffix -test.confirm, $(XDH_FUNCS))
+	$(RM) -f $(addsuffix -test, $(CRYPTO_TESTS))
+	$(RM) -f $(addsuffix -test.confirm, $(CRYPTO_TESTS))
 
 realclean:	clean
 	$(RM) -f *~ Makefile config.h  *.d \