diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-25 15:11:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-25 15:11:34 -0400 |
| commit | 1c5d680b3d6734e989a92deedbcf2bb46f31f7f9 (patch) | |
| tree | 9095ef06917bd77ce7581560de56872ef8f8ead7 /src/common/include.am | |
| parent | 50d15e06b32ce743ac4da532f29abb3781c4b990 (diff) | |
| parent | 46cda485bce60894d3128dcd42831a8c6cc7bcb4 (diff) | |
| download | tor-1c5d680b3d6734e989a92deedbcf2bb46f31f7f9.tar.gz tor-1c5d680b3d6734e989a92deedbcf2bb46f31f7f9.zip | |
Merge branch 'ed25519_ref10_squashed'
Conflicts:
src/common/include.am
src/ext/README
Diffstat (limited to 'src/common/include.am')
| -rw-r--r-- | src/common/include.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/common/include.am b/src/common/include.am index d669cf473a..5c000e86f3 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -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 \ |