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

diff --git a/Makefile.in b/Makefile.in
index 7ac915a..d31d44e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,7 @@
 #
 # secnet is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version d of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # secnet is distributed in the hope that it will be useful, but
@@ -20,7 +20,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.4.0~beta1
+VERSION=0.4.5
 
 @SET_MAKE@
 
@@ -62,13 +62,14 @@ 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 \
 	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
@@ -127,6 +128,8 @@ conffile.yy.h:	conffile.yy.c
 conffile.tab.c:	conffile.y
 # End of manual dependencies section
 
+conffile.yy.o: ALL_CFLAGS += -Wno-sign-compare
+
 secnet:	$(OBJECTS)
 	$(MAKE) version.o # *.o $(filter-out %.o, $^)
 	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) version.o $(LDLIBS)
@@ -142,11 +145,12 @@ 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 x25519-test.confirm x448-test.confirm
 
 version.c: Makefile
 	echo "#include \"secnet.h\"" >$@.new
-	@set -ex; if test -e .git; then \
+	@set -ex; if test -e .git && type -p git >/dev/null; then \
 		v=$$(git describe --match 'v*'); v=$${v#v}; \
 		if ! git diff --quiet HEAD; then v="$$v+"; fi; \
 	else \
@@ -162,9 +166,34 @@ 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
+
+$(addsuffix -test, $(XDH_FUNCS)): %-test: %-test.o %.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
+	./$*-test <$(srcdir)/$*-tests.in
+	touch $@
+
 check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
 	$(srcdir)/ipaddrset-test.py >ipaddrset-test.new
-	diff -u ipaddrset-test.expected ipaddrset-test.new
+	diff -u $(srcdir)/ipaddrset-test.expected ipaddrset-test.new
 
 .PRECIOUS: eax-%-test
 
@@ -187,7 +216,7 @@ install: installdirs
 	$(INSTALL_DATA) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py
 	$(INSTALL_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \
 		$(datarootdir)/secnet/.
-	$(INSTALL_DATA) secnet.8 $(mandir)/man8/secnet.8
+	$(INSTALL_DATA) ${srcdir}/secnet.8 $(mandir)/man8/secnet.8
 
 install-force:
 	rm -f $(STALE_PYTHON_FILES)
@@ -196,6 +225,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 \
@@ -204,50 +236,48 @@ realclean:	clean
 
 distclean:	realclean
 
-pfname:=$(PACKAGE)-$(VERSION)
-tarfname:=../$(pfname).tar
-dist:
-	$(RM) -rf $(tarfname) $(tarfname).gz
-	git archive --format=tar --prefix=$(pfname)/ HEAD -o $(tarfname)
-	gzip -9f $(tarfname)
-
 # Release checklist:
-#  1. Check that the tree has what you want
 #
-#  2. Update VERSION (above) and debian/changelog
-#     but DO NOT COMMIT
+#  0. Use this checklist from Makefile.in
 #
-#  3. Run
-#       ./configure
-#       make dist
-#     and check that the resulting tarball looks OK.
-#     Eg, untar it and build it, or have it reviewed.
+#  1. Check that the tree has what you want
 #
-#  3. Commit the updates to VERSION (above) and debian/changelog
+#  2. Update changelog:
+#         gbp dch --since=<PREVIOUS VERSION>
+#     and then edit debian/changelog.
 #
-#  4. git-tag -m "secnet $VERSION" -s v$VERSION
+#  3. Update VERSION (in this file, above) and
+#     finalise debian/changelog (removing ~ from version) and commit.
 #
-#  5. git-push origin v$VERSION v${VERSION}~0:master
+#  4. Build source and binaries:
+#       dgit -wgf sbuild -A -c stretch
 #
-#  6. Run, again,
-#       make dist
+#  5. dpkg -i on zealot just to check
+#       dpkg -i ~ian/things/Fvpn/bpd/secnet_${VERSION}_amd64.deb
 #
-#  7. gpg --detach-sign ../secnet-$VERSION.tar.gz
+#  6. run it on chiark
+#     check we can still ping davenant and chiark
 #
-#  8. rsync -v ../secnet-$VERSION.tar.gz* \
-#        chiark:/home/ianmdlvl/public-html/secnet/download/
+#  7. Make git tag and source tarball signature:
+#       git-tag -u general -m "secnet $VERSION" -s v${VERSION//\~/_}
+#       gpg -u general --detach-sign ../bpd/secnet_$VERSION.tar.gz
 #
-#  9. On chiark:
-#       tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$VERSION.tar.gz
-#       cd secnet-$VERSION
-#       debian/rules build
-#       fakeroot debian/rules binary
-#       mv ../secnet_${VERSION}_i386.deb ~ianmdlvl/public-html/secnet/download/
+#  8. Publish the branch and distriubtion files:
+#       git-push origin v${VERSION//\~/_} v${VERSION//\~/_}~0:master
+#       dcmd rsync -v ../bpd/secnet_${VERSION}_multi.changes chiark:/home/ianmdlvl/public-html/secnet/download/
 #
-#  10. On chiark as user secnet:
+#  9. Sort out html.  On chiark as user secnet:
 #       cd ~secnet/public-html/release/
 #       mkdir $VERSION
 #       cd $VERSION
 #       ln -s /home/ianmdlvl/public-html/secnet/download/secnet?$VERSION* .
+#       ln -sfn $VERSION ../current
+#
+# 10. write and post a release announcement
+#       cd ../bpd
+#       dcmd sha256sum secnet_${VERSION}_multi.changes
+#       ...
+#       gpg --clearsign ../release-announcement
+#       rsync -vP ../release-announcement.asc c:mail/d/
 #
-#  11. write and post a release announcement
+# 11. bump changelog version in master, to new version with ~