diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-21 16:52:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-22 09:49:13 -0400 |
| commit | 9cf6fc91b1d0870dab8bf87feb9132e7e0de2808 (patch) | |
| tree | 844acd03eae6aaf9bb43dac7b811da00714b97e3 /src/lib | |
| parent | 50a5954003a0478273d9e2c1a546e641e763a997 (diff) | |
| download | tor-9cf6fc91b1d0870dab8bf87feb9132e7e0de2808.tar.gz tor-9cf6fc91b1d0870dab8bf87feb9132e7e0de2808.zip | |
Remove map from container.h
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/container/container.h | 1 | ||||
| -rw-r--r-- | src/lib/crypt_ops/.may_include | 2 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/container/container.h b/src/lib/container/container.h index 1d0a477492..6912ae31ea 100644 --- a/src/lib/container/container.h +++ b/src/lib/container/container.h @@ -7,6 +7,5 @@ #define TOR_CONTAINER_H #include "lib/container/smartlist.h" -#include "lib/container/map.h" #endif /* !defined(TOR_CONTAINER_H) */ diff --git a/src/lib/crypt_ops/.may_include b/src/lib/crypt_ops/.may_include index 4f415f876e..94275c1d9e 100644 --- a/src/lib/crypt_ops/.may_include +++ b/src/lib/crypt_ops/.may_include @@ -11,5 +11,7 @@ trunnel/pwbox.h keccak-tiny/*.h ed25519/*.h +siphash.h + # XXX I'd like to remove this. common/*.h diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c index de7e271d39..9b1c38041f 100644 --- a/src/lib/crypt_ops/crypto.c +++ b/src/lib/crypt_ops/crypto.c @@ -73,6 +73,8 @@ ENABLE_GCC_WARNING(redundant-decls) #include "keccak-tiny/keccak-tiny.h" +#include "siphash.h" + /** Boolean: has OpenSSL's crypto been initialized? */ static int crypto_early_initialized_ = 0; |