summaryrefslogtreecommitdiff
path: root/src/common/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-06-17 10:41:22 -0400
committerNick Mathewson <nickm@torproject.org>2015-06-17 10:41:22 -0400
commitb9b658e727520d947e6c14475ee22e8606e9f062 (patch)
tree76a1997f4787d5879b2e3a57ac25f865fe426a60 /src/common/include.am
parent8d44ce910ddb00d6a9c18b912f2b027f822e5dc1 (diff)
downloadtor-b9b658e727520d947e6c14475ee22e8606e9f062.tar.gz
tor-b9b658e727520d947e6c14475ee22e8606e9f062.zip
Add the openssh 6.8p1 readpassphrase implementation
This way glibc users don't have to fall back to getpass. Windows users are still out of luck
Diffstat (limited to 'src/common/include.am')
-rw-r--r--src/common/include.am9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/common/include.am b/src/common/include.am
index b782310663..789f4003c9 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -51,6 +51,12 @@ if THREADS_WIN32
threads_impl_source=src/common/compat_winthreads.c
endif
+if BUILD_READPASSPHRASE_C
+readpassphrase_source=src/ext/readpassphrase.c
+else
+readpassphrase_source=
+endif
+
LIBOR_A_SOURCES = \
src/common/address.c \
src/common/backtrace.c \
@@ -67,7 +73,8 @@ LIBOR_A_SOURCES = \
src/ext/csiphash.c \
src/ext/trunnel/trunnel.c \
$(libor_extra_source) \
- $(threads_impl_source)
+ $(threads_impl_source) \
+ $(readpassphrase_source)
src/common/log.o: micro-revision.i