diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-28 17:38:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-25 11:58:13 -0400 |
| commit | e84e1c97458a7b0f449b6689caa0b3da2853f471 (patch) | |
| tree | f2c4df982535a07a4cbab6aa79c4efb8188afab4 /src/or | |
| parent | e72a5b3c070451e7762b1d22553cf077c50eb123 (diff) | |
| download | tor-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')
| -rw-r--r-- | src/or/control.c | 1 | ||||
| -rw-r--r-- | src/or/main.c | 1 |
2 files changed, 2 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 diff --git a/src/or/main.c b/src/or/main.c index 4ead8aa35c..61efc1f6f2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -28,6 +28,7 @@ #include "connection_or.h" #include "control.h" #include "cpuworker.h" +#include "crypto_s2k.h" #include "directory.h" #include "dirserv.h" #include "dirvote.h" |