projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix memcmp() reading out of bounds in the tinc info command.
[tinc]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
e0733be
..
a1d3423
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-2,10
+2,13
@@
sbin_PROGRAMS = tincd tinc
check_PROGRAMS = sptps_test sptps_keypair
sbin_PROGRAMS = tincd tinc
check_PROGRAMS = sptps_test sptps_keypair
-EXTRA_PROGRAMS =
sptps_test sptps_keypair
+EXTRA_PROGRAMS =
$(check_PROGRAMS)
CLEANFILES = version_git.h
CLEANFILES = version_git.h
+.PHONY: extra
+extra: $(EXTRA_PROGRAMS)
+
.PHONY: version-stamp
version-stamp:
.PHONY: version-stamp
version-stamp:
@@
-52,7
+55,9
@@
tincd_SOURCES = \
autoconnect.c autoconnect.h \
buffer.c buffer.h \
cipher.h \
autoconnect.c autoconnect.h \
buffer.c buffer.h \
cipher.h \
+ compression.h \
conf.c conf.h \
conf.c conf.h \
+ conf_net.c conf_net.h \
connection.c connection.h \
control.c control.h \
control_common.h \
connection.c connection.h \
control.c control.h \
control_common.h \
@@
-69,7
+74,8
@@
tincd_SOURCES = \
event.c event.h \
fd_device.c \
graph.c graph.h \
event.c event.h \
fd_device.c \
graph.c graph.h \
- hash.c hash.h \
+ hash.h \
+ keys.c keys.h \
have.h \
ipv4.h \
ipv6.h \
have.h \
ipv4.h \
ipv6.h \
@@
-118,6
+124,9
@@
tinc_SOURCES = \
ifconfig.c ifconfig.h \
info.c info.h \
invitation.c invitation.h \
ifconfig.c ifconfig.h \
info.c info.h \
invitation.c invitation.h \
+ conf.c conf.h \
+ keys.c keys.h \
+ splay_tree.c splay_tree.h \
list.c list.h \
names.c names.h \
netutl.c netutl.h \
list.c list.h \
names.c names.h \
netutl.c netutl.h \
@@
-207,13
+216,13
@@
endif
if OPENSSL
tincd_SOURCES += \
if OPENSSL
tincd_SOURCES += \
- openssl/cipher.c \
+ openssl/cipher.c
openssl/cipher.h
\
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c \
openssl/rsa.c
tinc_SOURCES += \
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c \
openssl/rsa.c
tinc_SOURCES += \
- openssl/cipher.c \
+ openssl/cipher.c
openssl/cipher.h
\
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c \
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c \
@@
-273,6
+282,13
@@
sptps_speed_SOURCES += \
endif
endif
endif
endif
+if WITH_LEGACY_PROTOCOL
+tinc_SOURCES += digest.c
+tincd_SOURCES += digest.c cipher.c
+sptps_test_SOURCES += digest.c
+sptps_speed_SOURCES += digest.c
+endif
+
if MINIUPNPC
tincd_SOURCES += upnp.h upnp.c
tincd_LDADD = $(MINIUPNPC_LIBS)
if MINIUPNPC
tincd_SOURCES += upnp.h upnp.c
tincd_LDADD = $(MINIUPNPC_LIBS)