[tor-commits] [tor/master] Rectify include paths (automated)

[nickm at torproject.org]

commit 727db7aeb9e3e4355b9a2fd065f2b7e52f1082b1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 21 10:53:36 2018 -0400

    Rectify include paths (automated)
---
 src/common/aes.c                         | 2 +-
 src/common/crypto_pwbox.c                | 2 +-
 src/common/util.h                        | 2 +-
 src/ext/ed25519/ref10/crypto_verify_32.h | 2 +-
 src/lib/ctime/di_ops.c                   | 2 +-
 src/or/keypin.c                          | 2 +-
 src/or/onion_ntor.h                      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/aes.c b/src/common/aes.c
index bdefc2b55..70e48a74f 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -39,7 +39,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "common/aes.h"
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 
 #ifdef ANDROID
 /* Android's OpenSSL seems to have removed all of its Engine support. */
diff --git a/src/common/crypto_pwbox.c b/src/common/crypto_pwbox.c
index 5ffe138ee..799a8799e 100644
--- a/src/common/crypto_pwbox.c
+++ b/src/common/crypto_pwbox.c
@@ -14,7 +14,7 @@
 #include "common/crypto_rand.h"
 #include "common/crypto_s2k.h"
 #include "common/crypto_util.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 #include "common/util.h"
 #include "trunnel/pwbox.h"
 
diff --git a/src/common/util.h b/src/common/util.h
index 8761e455f..b3c17db24 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -14,7 +14,7 @@
 #include "orconfig.h"
 #include "common/torint.h"
 #include "common/compat.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 #include "common/testsupport.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/ext/ed25519/ref10/crypto_verify_32.h b/src/ext/ed25519/ref10/crypto_verify_32.h
index f2000a321..529992875 100644
--- a/src/ext/ed25519/ref10/crypto_verify_32.h
+++ b/src/ext/ed25519/ref10/crypto_verify_32.h
@@ -1,4 +1,4 @@
 /* Added for Tor. */
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 #define crypto_verify_32(a,b) \
   (! tor_memeq((a), (b), 32))
diff --git a/src/lib/ctime/di_ops.c b/src/lib/ctime/di_ops.c
index 1ff1988b1..cc76be548 100644
--- a/src/lib/ctime/di_ops.c
+++ b/src/lib/ctime/di_ops.c
@@ -7,7 +7,7 @@
  **/
 
 #include "orconfig.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 #include "common/torlog.h"
 #include "common/util.h"
 
diff --git a/src/or/keypin.c b/src/or/keypin.c
index 402646028..921a401a4 100644
--- a/src/or/keypin.c
+++ b/src/or/keypin.c
@@ -14,7 +14,7 @@
 #include "common/compat.h"
 #include "common/crypto_digest.h"
 #include "common/crypto_format.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 #include "ht.h"
 #include "or/keypin.h"
 #include "siphash.h"
diff --git a/src/or/onion_ntor.h b/src/or/onion_ntor.h
index 3acb1eb62..13a3298ac 100644
--- a/src/or/onion_ntor.h
+++ b/src/or/onion_ntor.h
@@ -6,7 +6,7 @@
 
 #include "common/torint.h"
 #include "common/crypto_curve25519.h"
-#include "common/di_ops.h"
+#include "lib/ctime/di_ops.h"
 
 /** State to be maintained by a client between sending an ntor onionskin
  * and receiving a reply. */