X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/b0c1f00ce101fa475c51e26f3824ccd8864f649c..a4c6c9bad5c2965cf970071de0cb2f3179c22b50:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a130c20..7b58f75 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -146,7 +146,9 @@ endif
 
 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 \
+	f25519-test.confirm x25519-test.confirm \
+	fgoldi-test.confirm x448-test.confirm
 
 version.c: Makefile
 	echo "#include \"secnet.h\"" >$@.new
@@ -176,8 +178,16 @@ msgcode-test.confirm: msgcode-test
 XDH_FUNCS = x25519 x448
 x25519_FIELD = f25519
 x448_FIELD = fgoldi
+XDH_FIELDS = $(foreach f,$(XDH_FUNCS),$($f_FIELD))
 
-$(addsuffix -test, $(XDH_FUNCS)): %-test: %-test.o %.o
+$(addsuffix -test, $(XDH_FIELDS)): %-test: %-test.o %.o crypto-test.o
+	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+$(addsuffix -test.o, $(XDH_FIELDS)): %-test.o: ec-field-test.c
+	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c \
+		-DFIELD=$* $< -o $@
+
+$(addsuffix -test, $(XDH_FUNCS)): %-test: %-test.o %.o crypto-test.o
 	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
 x25519-test: f25519.o
 x448-test: fgoldi.o
@@ -187,7 +197,8 @@ $(addsuffix -test.o, $(XDH_FUNCS)): %-test.o: xdh-test.c
 		-DXDH=$* -DFIELD=$($*_FIELD) \
 		$< -o $@
 
-$(addsuffix -test.confirm, $(XDH_FUNCS)): %-test.confirm: %-test %-tests.in
+$(addsuffix -test.confirm, $(XDH_FUNCS) $(XDH_FIELDS)): \
+		%-test.confirm: %-test %-tests.in
 	./$*-test <$(srcdir)/$*-tests.in
 	touch $@