.PHONY: all clean realclean distclean dist install
PACKAGE:=secnet
-VERSION:=0.1.18
+VERSION:=0.2.1
@SET_MAKE@
-Wpointer-arith -Wformat=2 -Winit-self \
-Wswitch-enum -Wunused-variable -Wbad-function-cast \
-Wno-strict-aliasing -fno-strict-aliasing
-ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
-CPPFLAGS:=@CPPFLAGS@
-LDFLAGS:=@LDFLAGS@
-LDLIBS:=@LIBS@
+ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
+CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS)
+LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
+LDLIBS:=@LIBS@ $(EXTRA_LDLIBS)
prefix:=@prefix@
exec_prefix:=@exec_prefix@
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 \
+ netlink.o rsa.o dh.o \
+ serpentbe.o md5.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
%.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
# 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
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
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 \
# Release checklist:
# 1. Check that the tree has what you want
#
-# 2. Update VERSION above but DO NOT COMMIT
+# 2. Update VERSION (above) and debian/changelog
+# but DO NOT COMMIT
#
# 3. Run
# ./configure
# and check that the resulting tarball looks OK.
# Eg, untar it and build it, or have it reviewed.
#
-# 3. Commit the update to VERSION
+# 3. Commit the updates to VERSION (above) and debian/changelog
#
# 4. git-tag -s v$(VERSION)
#
# 5. git-push origin
#
-# 6. rsync -v ../secnet-$VERSION.tar.gz \
+# 6. Run, again,
+# make dist
+#
+# 7. gpg --detach-sign ../secnet-$(VERSION).tar.gz
+#
+# 8. rsync -v ../secnet-$VERSION.tar.gz* \
# chiark:/home/ianmdlvl/public-html/secnet/download/
#
-# 7. write and post a release announcement
+# 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_0.1.18.1-1_i386.deb ~/public-html/secnet/download/
+#
+# 10. On chiark as user secnet:
+# cd ~secnet/
+# rsync ~ianmdlvl/public-html/secnet/download/secnet* .
+#
+# 11. write and post a release announcement