@@@ and ed448

[secnet] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7b58f75..f7376e5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,8 +62,9 @@ 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 \
-       md5.o sha512.o tun.o slip.o sha1.o ipaddr.o log.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.
@@ -147,8 +148,9 @@ endif
 check: eax-aes-test.confirm eax-serpent-test.confirm \
        eax-serpentbe-test.confirm check-ipaddrset \
        msgcode-test.confirm \
-       f25519-test.confirm x25519-test.confirm \
-       fgoldi-test.confirm x448-test.confirm
+       keccak1600-test.confirm sha3-test.confirm \
+       f25519-test.confirm x25519-test.confirm ed25519-test.confirm \
+       fgoldi-test.confirm x448-test.confirm ed448-test.confirm
 
 version.c: Makefile
        echo "#include \"secnet.h\"" >$@.new
@@ -175,6 +177,20 @@ msgcode-test.confirm: msgcode-test
        ./msgcode-test
        touch $@
 
+keccak1600-test: keccak1600-test.o keccak1600.o crypto-test.o
+       $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+keccak1600-test.confirm: keccak1600-test keccak1600-tests.in
+       ./keccak1600-test <$(srcdir)/keccak1600-tests.in
+       touch $@
+
+sha3-test: sha3-test.o sha3.o keccak1600.o crypto-test.o
+       $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+sha3-test.confirm: sha3-test sha3-tests.in
+       ./sha3-test <$(srcdir)/sha3-tests.in
+       touch $@
+
 XDH_FUNCS = x25519 x448
 x25519_FIELD = f25519
 x448_FIELD = fgoldi
@@ -202,6 +218,21 @@ $(addsuffix -test.confirm, $(XDH_FUNCS) $(XDH_FIELDS)): \
        ./$*-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 $@
+
+ed448-test: ed448-test.o keccak1600.o sha3.o \
+               fgoldi.o scaf.o ed448.o crypto-test.o
+       $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+ed448-test.confirm: ed448-test ed448-tests.in
+       ./ed448-test <$(srcdir)/ed448-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