aboutsummaryrefslogtreecommitdiff
path: root/src/common/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-28 17:59:06 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-25 11:58:13 -0400
commit8184839a47ed1c7b42993d69d54e757a43bfda9c (patch)
tree4b7db0b9b8fd240e1015568a98963f2096eeb963 /src/common/include.am
parente84e1c97458a7b0f449b6689caa0b3da2853f471 (diff)
downloadtor-8184839a47ed1c7b42993d69d54e757a43bfda9c.tar.gz
tor-8184839a47ed1c7b42993d69d54e757a43bfda9c.zip
Rudimentary-but-sufficient passphrase-encrypted box code.
See crypto_pwbox.c for a description of the file format. There are tests for successful operation, but it still needs error-case tests.
Diffstat (limited to 'src/common/include.am')
-rw-r--r--src/common/include.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/include.am b/src/common/include.am
index 0fb1962720..83a3706489 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -75,6 +75,7 @@ LIBOR_A_SOURCES = \
LIBOR_CRYPTO_A_SOURCES = \
src/common/aes.c \
src/common/crypto.c \
+ src/common/crypto_pwbox.c \
src/common/crypto_s2k.c \
src/common/crypto_format.c \
src/common/torgzip.c \
@@ -111,6 +112,7 @@ COMMONHEADERS = \
src/common/container.h \
src/common/crypto.h \
src/common/crypto_curve25519.h \
+ src/common/crypto_pwbox.h \
src/common/crypto_s2k.h \
src/common/di_ops.h \
src/common/memarea.h \