aboutsummaryrefslogtreecommitdiff
path: root/src/lib/crypt_ops
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-06 20:27:43 -0500
committerNick Mathewson <nickm@torproject.org>2018-11-14 16:07:35 -0500
commite429e31ad1c3000d814f3172fcd3f7c433ee3219 (patch)
tree9bcd3f344b7cb4e2e6e38155f5a51e70ac497ae8 /src/lib/crypt_ops
parentc0a7527eb8590b39f11dd8b0ae18794dfc63a934 (diff)
downloadtor-e429e31ad1c3000d814f3172fcd3f7c433ee3219.tar.gz
tor-e429e31ad1c3000d814f3172fcd3f7c433ee3219.zip
Normalize .may_include to always have paths, and paths to include
Diffstat (limited to 'src/lib/crypt_ops')
-rw-r--r--src/lib/crypt_ops/.may_include4
-rw-r--r--src/lib/crypt_ops/crypto_init.c2
-rw-r--r--src/lib/crypt_ops/digestset.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/crypt_ops/.may_include b/src/lib/crypt_ops/.may_include
index 352fde858c..0739699686 100644
--- a/src/lib/crypt_ops/.may_include
+++ b/src/lib/crypt_ops/.may_include
@@ -13,7 +13,7 @@ lib/intmath/*.h
lib/sandbox/*.h
lib/string/*.h
lib/subsys/*.h
-lib/testsupport/testsupport.h
+lib/testsupport/*.h
lib/thread/*.h
lib/log/*.h
@@ -22,4 +22,4 @@ trunnel/pwbox.h
keccak-tiny/*.h
ed25519/*.h
-siphash.h
+ext/siphash.h
diff --git a/src/lib/crypt_ops/crypto_init.c b/src/lib/crypt_ops/crypto_init.c
index 4c4cc3e43b..f9943939fb 100644
--- a/src/lib/crypt_ops/crypto_init.c
+++ b/src/lib/crypt_ops/crypto_init.c
@@ -24,7 +24,7 @@
#include "lib/subsys/subsys.h"
-#include "siphash.h"
+#include "ext/siphash.h"
/** Boolean: has our crypto library been initialized? (early phase) */
static int crypto_early_initialized_ = 0;
diff --git a/src/lib/crypt_ops/digestset.c b/src/lib/crypt_ops/digestset.c
index 89dd377a9c..84516e0172 100644
--- a/src/lib/crypt_ops/digestset.c
+++ b/src/lib/crypt_ops/digestset.c
@@ -11,7 +11,7 @@
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/defs/digest_sizes.h"
#include "lib/crypt_ops/digestset.h"
-#include "siphash.h"
+#include "ext/siphash.h"
/* Wrap our hash function to have the signature that the bloom filter
* needs. */