aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-28 17:38:22 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-25 11:58:13 -0400
commite84e1c97458a7b0f449b6689caa0b3da2853f471 (patch)
treef2c4df982535a07a4cbab6aa79c4efb8188afab4 /src/or/control.c
parente72a5b3c070451e7762b1d22553cf077c50eb123 (diff)
downloadtor-e84e1c97458a7b0f449b6689caa0b3da2853f471.tar.gz
tor-e84e1c97458a7b0f449b6689caa0b3da2853f471.zip
More generic passphrase hashing code, including scrypt support
Uses libscrypt when found; otherwise, we don't have scrypt and we only support openpgp rfc2440 s2k hashing, or pbkdf2. Includes documentation and unit tests; coverage around 95%. Remaining uncovered code is sanity-checks that shouldn't be reachable fwict.
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 08cdad4943..0062e8180b 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -47,6 +47,7 @@
#include <sys/resource.h>
#endif
+#include "crypto_s2k.h"
#include "procmon.h"
/** Yield true iff <b>s</b> is the state of a control_connection_t that has