torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ed25519_ref10_squashed'

Browse Source 
Conflicts:
	src/common/include.am
	src/ext/README
This commit is contained in:
Nick Mathewson
2014-09-25 15:11:34 -04:00
parent 50d15e06b3 46cda485bc
commit 1c5d680b3d
96 changed files with 7104 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/include.am
+6 -1
View File
@@ -52,8 +52,12 @@ LIBDONNA=
endif
endif
LIBDONNA += $(LIBED25519_REF10)
if CURVE25519_ENABLED
libcrypto_extra_source=src/common/crypto_curve25519.c
libcrypto_extra_source = \
src/common/crypto_curve25519.c \
src/common/crypto_ed25519.c
endif
LIBOR_A_SOURCES = \
@@ -114,6 +118,7 @@ COMMONHEADERS = \
src/common/container.h \
src/common/crypto.h \
src/common/crypto_curve25519.h \
src/common/crypto_ed25519.h \
src/common/crypto_pwbox.h \
src/common/crypto_s2k.h \
src/common/di_ops.h \