X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2FMakefile.am;h=1a84098ebd05abf661ee17075e14ae2b32012a53;hb=2980173ee7f8142598fe5e1ab117e463751da310;hp=27d2330b063edd374fe893b20a9466c8f67d3d55;hpb=2df534808d75c5898a819a7a4063c7a6f2445bd4;p=tinc

diff --git a/src/Makefile.am b/src/Makefile.am
index 27d2330b..1a84098e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,33 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = tincd tinc sptps_test
+sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair
 
-EXTRA_DIST = linux bsd solaris cygwin mingw openssl gcrypt
+if LINUX
+sbin_PROGRAMS += sptps_speed
+endif
 
 DEFAULT_INCLUDES =
 
+ed25519_SOURCES = \
+	ed25519/add_scalar.c \
+	ed25519/ed25519.h \
+	ed25519/fe.c ed25519/fe.h \
+	ed25519/fixedint.h \
+	ed25519/ge.c ed25519/ge.h \
+	ed25519/key_exchange.c \
+	ed25519/keypair.c \
+	ed25519/precomp_data.h \
+	ed25519/sc.c ed25519/sc.h \
+	ed25519/seed.c \
+	ed25519/sha512.c ed25519/sha512.h \
+	ed25519/sign.c \
+	ed25519/verify.c
+
+chacha_poly1305_SOURCES = \
+	chacha-poly1305/chacha.c chacha-poly1305/chacha.h \
+	chacha-poly1305/chacha-poly1305.c chacha-poly1305/chacha-poly1305.h \
+	chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
+
 tincd_SOURCES = \
 	buffer.c buffer.h \
 	cipher.h \
@@ -57,6 +79,7 @@ tincd_SOURCES = \
 	route.c route.h \
 	rsa.h \
 	rsagen.h \
+	script.c script.h \
 	splay_tree.c splay_tree.h \
 	sptps.c sptps.h \
 	subnet.c subnet.h \
@@ -64,7 +87,9 @@ tincd_SOURCES = \
 	system.h \
 	tincd.c \
 	utils.c utils.h \
-	xalloc.h
+	xalloc.h \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
 tinc_SOURCES = \
 	dropin.c dropin.h \
@@ -75,17 +100,35 @@ tinc_SOURCES = \
 	list.c list.h \
 	names.c names.h \
 	netutl.c netutl.h \
+	script.c script.h \
 	sptps.c sptps.h \
 	subnet_parse.c subnet.h \
 	tincctl.c tincctl.h \
 	top.c top.h \
-	utils.c utils.h
+	utils.c utils.h \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
 sptps_test_SOURCES = \
 	logger.c logger.h \
 	sptps.c sptps.h \
 	sptps_test.c \
-	utils.c utils.h
+	utils.c utils.h \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
+
+sptps_keypair_SOURCES = \
+	sptps_keypair.c \
+	utils.c utils.h \
+	$(ed25519_SOURCES)
+
+sptps_speed_SOURCES = \
+	logger.c logger.h \
+	sptps.c sptps.h \
+	sptps_speed.c \
+	utils.c utils.h \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
 ## Conditionally compile device drivers
 	
@@ -96,7 +139,7 @@ endif
 if BSD
 tincd_SOURCES += bsd/device.c
 if TUNEMU
-tincd_SOURCES += bsd/tunemu.c
+tincd_SOURCES += bsd/tunemu.c bsd/tunemu.h
 endif
 endif
 
@@ -105,7 +148,7 @@ tincd_SOURCES += solaris/device.c
 endif
 
 if MINGW
-tincd_SOURCES += mingw/device.c
+tincd_SOURCES += mingw/device.c mingw/common.h
 endif
 
 if CYGWIN
@@ -124,27 +167,36 @@ if OPENSSL
 tincd_SOURCES += \
 	openssl/cipher.c \
 	openssl/crypto.c \
-	openssl/digest.c \
-	openssl/ecdh.c \
-	openssl/ecdsa.c \
+	openssl/digest.c openssl/digest.h \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
 	openssl/prf.c \
 	openssl/rsa.c
 tinc_SOURCES += \
 	openssl/cipher.c \
 	openssl/crypto.c \
-	openssl/digest.c \
-	openssl/ecdh.c \
-	openssl/ecdsa.c \
-	openssl/ecdsagen.c \
+	openssl/digest.c openssl/digest.h \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	ed25519/ecdsagen.c \
 	openssl/prf.c \
 	openssl/rsa.c \
 	openssl/rsagen.c
 sptps_test_SOURCES += \
-	openssl/cipher.c \
 	openssl/crypto.c \
-	openssl/digest.c \
-	openssl/ecdh.c \
-	openssl/ecdsa.c \
+	openssl/digest.c openssl/digest.h \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	openssl/prf.c
+sptps_keypair_SOURCES += \
+	openssl/crypto.c \
+	ed25519/ecdsagen.c
+sptps_speed_SOURCES += \
+	openssl/crypto.c \
+	openssl/digest.c openssl/digest.h \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	ed25519/ecdsagen.c \
 	openssl/prf.c
 endif
 
@@ -152,7 +204,7 @@ if GCRYPT
 tincd_SOURCES += \
 	gcrypt/cipher.c \
 	gcrypt/crypto.c \
-	gcrypt/digest.c \
+	gcrypt/digest.c gcrypt/digest.h \
 	gcrypt/ecdh.c \
 	gcrypt/ecdsa.c \
 	gcrypt/prf.c \
@@ -160,7 +212,7 @@ tincd_SOURCES += \
 tinc_SOURCES += \
 	gcrypt/cipher.c \
 	gcrypt/crypto.c \
-	gcrypt/digest.c \
+	gcrypt/digest.c gcrypt/digest.h \
 	gcrypt/ecdh.c \
 	gcrypt/ecdsa.c \
 	gcrypt/ecdsagen.c \
@@ -170,21 +222,19 @@ tinc_SOURCES += \
 sptps_test_SOURCES += \
 	gcrypt/cipher.c \
 	gcrypt/crypto.c \
-	gcrypt/digest.c \
+	gcrypt/digest.c gcrypt/digest.h \
 	gcrypt/ecdh.c \
 	gcrypt/ecdsa.c \
 	gcrypt/prf.c
 endif
 
 tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
+sptps_speed_LDADD = -lrt
 
-LIBS = @LIBS@ @LIBGCRYPT_LIBS@
+LIBS = @LIBS@
 
 if TUNEMU
 LIBS += -lpcap
 endif
 
 AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
-
-dist-hook:
-	rm -f `find . -type l`