Update crypto code from Catacomb 2.5.0.

[secnet] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7de2918..4ec557f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,14 +61,15 @@ 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 \
+       netlink.o rsa.o dh.o xdh.o serpent.o serpentbe.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
 # version.o is handled specially below and in the link rule for secnet.
 
 TEST_OBJECTS:=eax-aes-test.o eax-serpent-test.o eax-serpentbe-test.o \
-               eax-test.o aes.o
+               eax-test.o aes.o x25519-test.o x448-test.o
 
 ifeq (version.o,$(MAKECMDGOALS))
 OBJECTS:=version.o
@@ -144,7 +145,10 @@ secnet: $(wildcard .git/packed-refs)
 endif
 
 check: eax-aes-test.confirm eax-serpent-test.confirm \
-       eax-serpentbe-test.confirm check-ipaddrset
+       eax-serpentbe-test.confirm check-ipaddrset \
+       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
@@ -164,6 +168,47 @@ eax-%-test.confirm: eax-%-test eax-%-test.vectors
        ./$< <$(srcdir)/eax-$*-test.vectors >$@.new
        mv -f $@.new $@
 
+msgcode-test: msgcode-test.o
+       $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+msgcode-test.confirm: msgcode-test
+       ./msgcode-test
+       touch $@
+
+XDH_FUNCS = x25519 x448
+x25519_FIELD = f25519
+x448_FIELD = fgoldi
+XDH_FIELDS = $(foreach f,$(XDH_FUNCS),$($f_FIELD))
+
+$(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
+
+$(addsuffix -test.o, $(XDH_FUNCS)): %-test.o: xdh-test.c
+       $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c \
+               -DXDH=$* -DFIELD=$($*_FIELD) \
+               $< -o $@
+
+$(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
@@ -198,6 +243,9 @@ install-force:
 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))
 
 realclean:     clean
        $(RM) -f *~ Makefile config.h  *.d \