From 269b779eadb84366ccad8a3c53a66780684e4f62 Mon Sep 17 00:00:00 2001 From: Jochen Hoenicke Date: Mon, 25 Apr 2016 16:32:38 +0200 Subject: [PATCH] Updated cmake configuration for ed25519 --- CMakeLists.txt | 3 ++- Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c80b4899..1baf39876 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 2.6) -set(SOURCES aescrypt.c aeskey.c aes_modes.c aestab.c base58.c bignum.c bip32.c bip39.c ecdsa.c hmac.c nist256p1.c pbkdf2.c rand.c ripemd160.c secp256k1.c sha2.c) +set(SOURCES aescrypt.c aeskey.c aes_modes.c aestab.c base58.c bignum.c bip32.c bip39.c ecdsa.c hmac.c nist256p1.c pbkdf2.c rand.c ripemd160.c secp256k1.c sha2.c ed25519-donna/ed25519.c) +include_directories(ed25519-donna) # disable sequence point warnings where they are expected set_source_files_properties(aeskey.c PROPERTIES diff --git a/Makefile b/Makefile index 7ae782975..bded2f835 100644 --- a/Makefile +++ b/Makefile @@ -37,9 +37,9 @@ SRCS = bignum.c ecdsa.c curves.c secp256k1.c nist256p1.c rand.c hmac.c bip32.c SRCS += ripemd160.c SRCS += sha2.c SRCS += aescrypt.c aeskey.c aestab.c aes_modes.c +SRCS += ed25519-donna/ed25519.c OBJS = $(SRCS:.c=.o) -OBJS += ed25519-donna/ed25519.o TESTLIBS = -lcheck -lrt -lpthread -lm TESTSSLLIBS = -lcrypto