X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=Makefile.in;h=ba5a861d8f4f50e8f30f6f43e23cd20992f4cd99;hp=182204b4b791dfcd92453430052567b9cb203ae9;hb=0757576591ae7ba84ee28067c04fa7d5490632c4;hpb=68438849fa74b4dc3c3354b990bcd05e8fb78861

diff --git a/Makefile.in b/Makefile.in
index 182204b..ba5a861 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.2.1
+VERSION:=0.3.1
 
 @SET_MAKE@
 
@@ -32,11 +32,11 @@ INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 
 CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
-	-W -Wno-unused \
+	-W -Wno-unused -Wno-unused-parameter \
 	-Wno-pointer-sign -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations -Wnested-externs -Wredundant-decls \
 	-Wpointer-arith -Wformat=2 -Winit-self \
-	-Wswitch-enum -Wunused-variable -Wbad-function-cast \
+	-Wswitch-enum -Wunused-variable -Wunused-function -Wbad-function-cast \
 	-Wno-strict-aliasing -fno-strict-aliasing
 ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
 CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS)
@@ -53,11 +53,15 @@ mandir:=@mandir@
 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.o netlink.o rsa.o dh.o \
-	serpent.o md5.o version.o tun.o slip.o sha1.o ipaddr.o log.o \
+	resolver.o random.o udp.o site.o transform-cbcmac.o transform-eax.o \
+	netlink.o rsa.o dh.o serpent.o serpentbe.o \
+	md5.o sha512.o version.o tun.o slip.o sha1.o ipaddr.o log.o \
 	process.o @LIBOBJS@ \
 	hackypar.o
 
+TEST_OBJECTS:=eax-aes-test.o eax-serpent-test.o eax-serpentbe-test.o \
+		eax-test.o aes.o
+
 %.c:	%.y
 
 %.yy.c:	%.fl
@@ -69,7 +73,7 @@ OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
 %.o: %.c
 	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
 
-all:	$(TARGETS)
+all:	$(TARGETS) check
 
 # Automatic remaking of configuration files, from autoconf documentation
 ${srcdir}/configure: configure.in
@@ -93,8 +97,8 @@ config.status: configure
 # End of config file remaking rules
 
 # C and header file dependency rules
-SOURCES:=$(OBJECTS:.o=.c)
-DEPENDS:=$(OBJECTS:.o=.d)
+SOURCES:=$(OBJECTS:.o=.c) $(TEST_OBJECTS:.o=.c)
+DEPENDS:=$(OBJECTS:.o=.d) $(TEST_OBJECTS:.o=.d)
 
 $(DEPENDS): ${srcdir}/depend.sh
 
@@ -112,11 +116,23 @@ conffile.tab.c:	conffile.y
 secnet:	$(OBJECTS)
 	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
 
+check: eax-aes-test.confirm eax-serpent-test.confirm \
+	eax-serpentbe-test.confirm
+
 version.c: Makefile
 	echo "#include \"secnet.h\"" >$@.new
 	echo "char version[]=\"secnet $(VERSION)\";" >>$@.new
 	mv -f $@.new $@
 
+eax-%-test: eax-%-test.o eax-test.o %.o
+	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+eax-%-test.confirm: eax-%-test eax-%-test.vectors
+	./$< <$(srcdir)/eax-$*-test.vectors >$@.new
+	mv -f $@.new $@
+
+.PRECIOUS: eax-%-test
+
 installdirs:
 	$(INSTALL) -d $(prefix)/share/secnet $(sbindir)
 	$(INSTALL) -d $(mandir)/man8
@@ -129,7 +145,7 @@ install: installdirs
 
 clean:
 	$(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
-	$(RM) -f *.d *~
+	$(RM) -f *.d *~ eax-*-test.confirm eax-*-test
 
 realclean:	clean
 	$(RM) -f *~ Makefile config.h  *.d \
@@ -159,27 +175,29 @@ dist:
 #
 #  3. Commit the updates to VERSION (above) and debian/changelog
 #
-#  4. git-tag -s v$(VERSION)
+#  4. git-tag -m "secnet $VERSION" -s v$VERSION
 #
-#  5. git-push origin
+#  5. git-push origin v$VERSION v${VERSION}~0:master
 #
 #  6. Run, again,
 #       make dist
 #
-#  7. gpg --detach-sign ../secnet-$(VERSION).tar.gz
+#  7. gpg --detach-sign ../secnet-$VERSION.tar.gz
 #
 #  8. rsync -v ../secnet-$VERSION.tar.gz* \
 #        chiark:/home/ianmdlvl/public-html/secnet/download/
 #
 #  9. On chiark:
-#       tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$(VERSION).tar.gz
-#       cd secnet-$(VERSION)
+#       tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$VERSION.tar.gz
+#       cd secnet-$VERSION
 #       debian/rules build
 #       fakeroot debian/rules binary
-#       mv ../secnet_0.1.18.1-1_i386.deb ~/public-html/secnet/download/
+#       mv ../secnet_${VERSION}_i386.deb ~ianmdlvl/public-html/secnet/download/
 #
 #  10. On chiark as user secnet:
-#       cd ~secnet/
-#       rsync ~ianmdlvl/public-html/secnet/download/secnet* .
+#       cd ~secnet/public-html/release/
+#       mkdir $VERSION
+#       cd $VERSION
+#       ln -s /home/ianmdlvl/public-html/secnet/download/secnet?$VERSION* .
 #
 #  11. write and post a release announcement