Update crypto code from Catacomb 2.5.0.

[secnet] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a130c20..4ec557f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,7 +62,7 @@ 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 xdh.o serpent.o serpentbe.o \
-       f25519.o x25519.o fgoldi.o x448.o \
+       scaf.o f25519.o x25519.o ed25519.o fgoldi.o x448.o \
        md5.o sha512.o tun.o slip.o sha1.o ipaddr.o log.o \
        process.o @LIBOBJS@ \
        hackypar.o
@@ -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 ed25519-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,10 +197,18 @@ $(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 $@
 
+ed25519-test: ed25519-test.o sha512.o f25519.o scaf.o ed25519.o crypto-test.o
+       $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+ed25519-test.confirm: ed25519-test ed25519-tests.in
+       ./ed25519-test <$(srcdir)/ed25519-tests.in
+       touch $@
+
 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