diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-03 13:50:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-03 13:50:18 -0400 |
| commit | c3b72583709332f051fb61e17f5102d0ada05917 (patch) | |
| tree | a686097afdcda0074eb00d7b6e667abf91dc19e5 /src/common/crypto_digest.c | |
| parent | 94c6eb7d7f023e50071632e618f003409e5e6489 (diff) | |
| parent | 94dcd38a1430061a0bb630ad680a41a78262a55c (diff) | |
| download | tor-c3b72583709332f051fb61e17f5102d0ada05917.tar.gz tor-c3b72583709332f051fb61e17f5102d0ada05917.zip | |
Merge remote-tracking branch 'isis/bug24660_r1'
Diffstat (limited to 'src/common/crypto_digest.c')
| -rw-r--r-- | src/common/crypto_digest.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/common/crypto_digest.c b/src/common/crypto_digest.c index cdcc1828c8..f7163de133 100644 --- a/src/common/crypto_digest.c +++ b/src/common/crypto_digest.c @@ -10,10 +10,13 @@ * operations. **/ +#include "container.h" #include "crypto_digest.h" - -#include "crypto.h" /* common functions */ #include "crypto_openssl_mgt.h" +#include "crypto_util.h" +#include "torlog.h" + +#include "keccak-tiny/keccak-tiny.h" DISABLE_GCC_WARNING(redundant-decls) @@ -22,8 +25,6 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) -#include "container.h" - /* Crypto digest functions */ /** Compute the SHA1 digest of the <b>len</b> bytes on data stored in |