Use Ed25519 keys.

[meshlink] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b9a830712efc4f83e007e4ca7833b3a5874a1ebe..083b2728641049205bee646a06c5159c0eb0e6a1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = sptps_test
+sbin_PROGRAMS = sptps_test sptps_keypair
 
 if LINUX
 sbin_PROGRAMS += sptps_speed
@@ -8,17 +8,39 @@ 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
+
 sptps_test_SOURCES = \
        logger.c logger.h \
        sptps.c sptps.h \
        sptps_test.c \
-       utils.c utils.h
+       utils.c utils.h \
+       $(ed25519_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
+       utils.c utils.h \
+       $(ed25519_SOURCES)
 
 lib_LTLIBRARIES = libmeshlink.la
 
@@ -58,14 +80,13 @@ libmeshlink_la_SOURCES = \
        protocol_key.c \
        protocol_misc.c \
        route.c route.h \
-       rsa.h \
-       rsagen.h \
        splay_tree.c splay_tree.h \
        sptps.c sptps.h \
        system.h \
        tincd.c \
        utils.c utils.h \
-       xalloc.h
+       xalloc.h \
+       $(ed25519_SOURCES)
 
 libmeshlink_la_CFLAGS = -fPIC
 
@@ -78,23 +99,24 @@ libmeshlink_la_SOURCES += \
        openssl/ecdh.c \
        openssl/ecdsa.c \
        openssl/ecdsagen.c \
-       openssl/prf.c \
-       openssl/rsa.c \
-       openssl/rsagen.c
+       openssl/prf.c
 sptps_test_SOURCES += \
        openssl/cipher.c \
        openssl/crypto.c \
        openssl/digest.c openssl/digest.h \
-       openssl/ecdh.c \
-       openssl/ecdsa.c \
+       ed25519/ecdh.c \
+       ed25519/ecdsa.c \
        openssl/prf.c
+sptps_keypair_SOURCES += \
+       openssl/crypto.c \
+       ed25519/ecdsagen.c
 sptps_speed_SOURCES += \
        openssl/cipher.c \
        openssl/crypto.c \
        openssl/digest.c openssl/digest.h \
-       openssl/ecdh.c \
-       openssl/ecdsa.c \
-       openssl/ecdsagen.c \
+       ed25519/ecdh.c \
+       ed25519/ecdsa.c \
+       ed25519/ecdsagen.c \
        openssl/prf.c
 
 sptps_speed_LDADD = -lrt