Rectify include paths (automated)

diff --git a/src/common/aes.c b/src/common/aes.c
index bdefc2b55557d2efc3801672ccce132f6ee83fcf..70e48a74f30a21883321f7340b6e6e94b5dad095 100644 (file)
--- 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 5ffe138ee2d662a1681be09a7aac30d424dab620..799a8799e6ad975d9e28159b98e83dc5fcd0fd18 100644 (file)
--- 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 8761e455fdef447d863d2c5e118492016ccb61b5..b3c17db248d89dc2a0bfe8efa0ccb06e06e6ac68 100644 (file)
--- 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 f2000a321d02b0d145c17a4e9f5801ab1d96403d..529992875464b8d0e324336d0096d64883ad45cb 100644 (file)
--- 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 1ff1988b1015fe60682fadc47fb76079ed6dc588..cc76be54889c2c9e4a83f44601437d687ac9612b 100644 (file)
--- 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 40264602816d752bcc7cf02d6d37cd5a85118a7b..921a401a4f15e8d934936aa810d43dcb08d4502c 100644 (file)
--- 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 3acb1eb626477810458411a1763161dfff7f6e50..13a3298ac0d9b4938ec8e2376b635a74a3e9ef1d 100644 (file)
--- 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. */