~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
site: interpret first 4 bytes of extrainfo as capabilities
[secnet]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
7472752
..
5a140fb
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-18,7
+18,7
@@
.PHONY: all clean realclean distclean dist install
PACKAGE:=secnet
.PHONY: all clean realclean distclean dist install
PACKAGE:=secnet
-VERSION:=0.
1.18
+VERSION:=0.
2.1
@SET_MAKE@
@SET_MAKE@
@@
-38,10
+38,10
@@
CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
-Wpointer-arith -Wformat=2 -Winit-self \
-Wswitch-enum -Wunused-variable -Wbad-function-cast \
-Wno-strict-aliasing -fno-strict-aliasing
-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@
prefix:=@prefix@
exec_prefix:=@exec_prefix@
@@
-53,11
+53,15
@@
mandir:=@mandir@
TARGETS:=secnet
OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
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
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
%.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 $@
%.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
# 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
# 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
$(DEPENDS): ${srcdir}/depend.sh
@@
-112,11
+116,23
@@
conffile.tab.c: conffile.y
secnet: $(OBJECTS)
$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
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 $@
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
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
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 \
realclean: clean
$(RM) -f *~ Makefile config.h *.d \
@@
-163,20
+179,23
@@
dist:
#
# 5. git-push origin
#
#
# 5. git-push origin
#
-# 6. gpg --detach-sign ../secnet-$(VERSION).tar.gz
+# 6. Run, again,
+# make dist
+#
+# 7. gpg --detach-sign ../secnet-$(VERSION).tar.gz
#
#
-#
7
. rsync -v ../secnet-$VERSION.tar.gz* \
+#
8
. rsync -v ../secnet-$VERSION.tar.gz* \
# chiark:/home/ianmdlvl/public-html/secnet/download/
#
# chiark:/home/ianmdlvl/public-html/secnet/download/
#
-#
8
. On chiark:
+#
9
. On chiark:
# tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$(VERSION).tar.gz
# cd secnet-$(VERSION)
# debian/rules build
# fakeroot debian/rules binary
# tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$(VERSION).tar.gz
# cd secnet-$(VERSION)
# debian/rules build
# fakeroot debian/rules binary
-#
cp
../secnet_0.1.18.1-1_i386.deb ~/public-html/secnet/download/
+#
mv
../secnet_0.1.18.1-1_i386.deb ~/public-html/secnet/download/
#
#
-#
9
. On chiark as user secnet:
+#
10
. On chiark as user secnet:
# cd ~secnet/
# rsync ~ianmdlvl/public-html/secnet/download/secnet* .
#
# cd ~secnet/
# rsync ~ianmdlvl/public-html/secnet/download/secnet* .
#
-#
9
. write and post a release announcement
+#
11
. write and post a release announcement