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

[nickm]

commit 3305ae50442aaed13a9e15c392439c348e6182be
Author: Nick Mathewson 
Date:   Thu Jun 21 13:12:23 2018 -0400

Rectify include paths (automated).

You have no idea how glad I am that this is automated.
---
 src/common/buffers.h  | 2 +-
 src/common/compat.h   | 2 +-
 src/common/compat_libevent.h  | 2 +-
 src/common/compat_threads.h   | 2 +-
 src/common/timers.h   | 2 +-
 src/common/token_bucket.h | 2 +-
 src/common/torlog.h   | 2 +-
 src/common/util.h | 2 +-
 src/common/util_bug.h | 2 +-
 src/common/util_format.h  | 2 +-
 src/lib/crypt_ops/crypto_curve25519.h | 2 +-
 src/lib/crypt_ops/crypto_ed25519.h| 2 +-
 src/lib/crypt_ops/crypto_format.h | 2 +-
 src/lib/crypt_ops/crypto_rand.c   | 2 +-
 src/lib/crypt_ops/crypto_rsa.h| 2 +-
 src/lib/tls/tortls.h  | 2 +-
 src/or/addressmap.h   | 2 +-
 src/or/circuitlist.h  | 2 +-
 src/or/circuitmux.h   | 2 +-
 src/or/config.h   | 2 +-
 src/or/connection_edge.h  | 2 +-
 src/or/dirauth/dircollate.h   | 2 +-
 src/or/dirserv.h  | 2 +-
 src/or/geoip.h| 2 +-
 src/or/hibernate.h| 2 +-
 src/or/keypin.h   | 2 +-
 src/or/networkstatus.h| 2 +-
 src/or/router.h   | 2 +-
 src/or/routerlist.h   | 2 +-
 src/or/scheduler.h| 2 +-
 src/or/status.h   | 2 +-
 src/test/test_channelpadding.c| 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/common/buffers.h b/src/common/buffers.h
index 5956e3484..80103af77 100644
--- a/src/common/buffers.h
+++ b/src/common/buffers.h
@@ -14,7 +14,7 @@
 
 #include "common/compat.h"
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 typedef struct buf_t buf_t;
 
diff --git a/src/common/compat.h b/src/common/compat.h
index 654f10390..dff29a42b 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -15,7 +15,7 @@
 #endif
 #endif
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #ifdef HAVE_SYS_PARAM_H
 #include 
 #endif
diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h
index 76a074d93..4b2672b7b 100644
--- a/src/common/compat_libevent.h
+++ b/src/common/compat_libevent.h
@@ -5,7 +5,7 @@
 #define TOR_COMPAT_LIBEVENT_H
 
 #include "orconfig.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 void configure_libevent_logging(void);
 void suppress_libevent_log_msg(const char *msg);
diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h
index ed0ece5ab..19e0a4f11 100644
--- a/src/common/compat_threads.h
+++ b/src/common/compat_threads.h
@@ -8,7 +8,7 @@
 
 #include "orconfig.h"
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 #if defined(HAVE_PTHREAD_H) && !defined(_WIN32)
 #include 
diff --git a/src/common/timers.h b/src/common/timers.h
index 6b6179ca7..2348c7b7c 100644
--- a/src/common/timers.h
+++ b/src/common/timers.h
@@ -5,7 +5,7 @@
 #define TOR_TIMERS_H
 
 #include "orconfig.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 struct monotime_t;
 typedef struct timeout tor_timer_t;
diff --git a/src/common/token_bucket.h b/src/common/token_bucket.h
index fd6834f26..787317fa1 100644
--- a/src/common/token_bucket.h
+++ b/src/common/token_bucket.h
@@ -10,7 +10,7 @@
 #define TOR_TOKEN_BUCKET_H
 
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 /** Largest allowable burst value for a token buffer. */
 #define TOKEN_BUCKET_MAX_BURST INT32_MAX
diff --git a/src/common/torlog.h b/src/common/torlog.h
index 56f922d40..66141ab0a 100644
--- a/src/common/torlog.h
+++ b/src/common/torlog.h
@@ -13,7 +13,7 @@
 #ifndef TOR_TORLOG_H
 
 #include "common/compat.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 #ifdef HAVE_SYSLOG_H
 #include 
diff --git a/src/common/util.h b/src/common/util.h
index cb8cefb12..d1528886c 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -15,7 +15,7 @@
 #include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "lib/ctime/di_ops.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include 
 #include 
 #ifdef _WIN32
diff --git a/src/common/util_bug.h b/src/common/util_bug.h
index 1d499a197..9659f59b7 100644
--- a/src/common/util_bug.h
+++ b/src/common/util_bug.h
@@ -38,7 +38,7 @@
 
 #include "orconfig.h"
 #include "common/compat.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 /* Replace assert() with a variant that sends failures to the log before
  * callin

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

[nickm]

commit 209a2851663c62474b7b719d03fcca378201c0f9
Author: Nick Mathewson 
Date:   Thu Jun 21 12:03:34 2018 -0400

Rectify include paths (automated)
---
 src/lib/trace/events.h | 2 +-
 src/lib/trace/trace.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/trace/events.h b/src/lib/trace/events.h
index 761a0f4eb..6d4269aae 100644
--- a/src/lib/trace/events.h
+++ b/src/lib/trace/events.h
@@ -31,7 +31,7 @@
 /* Enable event tracing for the debug framework where all trace events are
  * mapped to a log_debug(). */
 #ifdef USE_EVENT_TRACING_DEBUG
-#include "trace/debug.h"
+#include "lib/trace/debug.h"
 #endif
 
 #else /* TOR_EVENT_TRACING_ENABLED */
diff --git a/src/lib/trace/trace.c b/src/lib/trace/trace.c
index b39a2bbc5..c00cc 100644
--- a/src/lib/trace/trace.c
+++ b/src/lib/trace/trace.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2017-2018, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
-#include "trace/trace.h"
+#include "lib/trace/trace.h"
 
 /** Initialize the tracing library. */
 void



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit fa5fda5bbfd1c3ebcd9f01d0d86509c68dfd4268
Author: Nick Mathewson 
Date:   Thu Jun 21 12:20:52 2018 -0400

Rectify include paths (automated)
---
 src/common/address.h| 2 +-
 src/common/address_set.h| 2 +-
 src/common/buffers.c| 2 +-
 src/common/buffers.h| 2 +-
 src/common/buffers_tls.c| 2 +-
 src/common/compat.h | 4 ++--
 src/common/compat_threads.h | 2 +-
 src/common/crypto.c | 2 +-
 src/common/crypto.h | 2 +-
 src/common/crypto_curve25519.h  | 2 +-
 src/common/crypto_digest.h  | 2 +-
 src/common/crypto_ed25519.h | 2 +-
 src/common/crypto_format.h  | 2 +-
 src/common/crypto_pwbox.h   | 2 +-
 src/common/crypto_rand.h| 2 +-
 src/common/crypto_rsa.h | 2 +-
 src/common/crypto_s2k.h | 2 +-
 src/common/crypto_util.h| 2 +-
 src/common/sandbox.c| 2 +-
 src/common/sandbox.h| 2 +-
 src/common/token_bucket.h   | 2 +-
 src/common/util.c   | 2 +-
 src/common/util.h   | 2 +-
 src/common/util_format.c| 2 +-
 src/common/util_format.h| 2 +-
 src/ext/OpenBSD_malloc_Linux.c  | 2 +-
 src/ext/csiphash.c  | 2 +-
 src/ext/curve25519_donna/curve25519-donna-c64.c | 2 +-
 src/ext/curve25519_donna/curve25519-donna.c | 2 +-
 src/ext/ed25519/donna/ed25519_donna_tor.h   | 2 +-
 src/ext/ed25519/ref10/crypto_int32.h| 2 +-
 src/ext/ed25519/ref10/crypto_int64.h| 2 +-
 src/ext/ed25519/ref10/crypto_uint32.h   | 2 +-
 src/ext/ed25519/ref10/crypto_uint64.h   | 2 +-
 src/ext/ed25519/ref10/ed25519_ref10.h   | 2 +-
 src/ext/keccak-tiny/keccak-tiny.h   | 2 +-
 src/ext/mulodi/mulodi4.c| 2 +-
 src/lib/compress/compress.c | 2 +-
 src/lib/ctime/di_ops.h  | 2 +-
 src/lib/err/backtrace.h | 2 +-
 src/lib/err/torerr.h| 2 +-
 src/or/circuitlist.c| 2 +-
 src/or/dir_server_st.h  | 2 +-
 src/or/entry_port_cfg_st.h  | 2 +-
 src/or/keypin.c | 2 +-
 src/or/onion_ntor.h | 2 +-
 src/or/or.h | 2 +-
 47 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/common/address.h b/src/common/address.h
index 2c9c620c2..317c7f329 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -13,7 +13,7 @@
 
 //#include 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "common/container.h"
 
diff --git a/src/common/address_set.h b/src/common/address_set.h
index f4986c9b0..cfee89cfb 100644
--- a/src/common/address_set.h
+++ b/src/common/address_set.h
@@ -14,7 +14,7 @@
 #define TOR_ADDRESS_SET_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /**
  * An address_set_t represents a set of tor_addr_t values. The implementation
diff --git a/src/common/buffers.c b/src/common/buffers.c
index fd029c26c..41f98ddf7 100644
--- a/src/common/buffers.c
+++ b/src/common/buffers.c
@@ -25,7 +25,7 @@
 #include "common/compat.h"
 #include "lib/compress/compress.h"
 #include "common/util.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #ifdef HAVE_UNISTD_H
 #include 
diff --git a/src/common/buffers.h b/src/common/buffers.h
index 5cd9d3ec6..5956e3484 100644
--- a/src/common/buffers.h
+++ b/src/common/buffers.h
@@ -13,7 +13,7 @@
 #define TOR_BUFFERS_H
 
 #include "common/compat.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 
 typedef struct buf_t buf_t;
diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c
index c380369b5..0a57b9552 100644
--- a/src/common/buffers_tls.c
+++ b/src/common/buffers_tls.c
@@ -12,7 +12,7 @@
 #include "common/compat.h"
 #include "lib/compress/compress.h"
 #include "common/util.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #include "common/tortls.h"
 #ifdef HAVE_UNISTD_H
diff --git a/src/common/compat.h b/src/common/compat.h
index da9bd8bcc..0cc257fc9 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -14,7 +14,7 @@
 #define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747b
 #endif
 #endif
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 #ifdef HAVE_SYS_PARAM_H
 #include 
@@ -45,7

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

[nickm]

commit accf239fa3e84451711a25a96ddb13877fd9fcfa
Author: Nick Mathewson 
Date:   Thu Jun 21 12:47:11 2018 -0400

Rectify include paths (automated)
---
 src/common/address_set.c   |  2 +-
 src/common/compat_libevent.c   |  2 +-
 src/common/container.c |  2 +-
 src/common/util.c  |  2 +-
 src/common/workqueue.c |  2 +-
 src/ext/ed25519/donna/ed25519-hash-custom.h|  2 +-
 src/ext/ed25519/donna/ed25519-randombytes-custom.h |  2 +-
 src/ext/ed25519/donna/ed25519_tor.c|  2 +-
 src/ext/ed25519/ref10/blinding.c   |  2 +-
 src/ext/ed25519/ref10/crypto_hash_sha512.h |  2 +-
 src/ext/ed25519/ref10/keypair.c|  4 ++--
 src/ext/ed25519/ref10/randombytes.h|  2 +-
 src/ext/keccak-tiny/keccak-tiny-unrolled.c |  2 +-
 src/lib/crypt_ops/aes.c|  6 +++---
 src/lib/crypt_ops/compat_openssl.h |  2 +-
 src/lib/crypt_ops/crypto.c | 22 +++---
 src/lib/crypt_ops/crypto.h |  2 +-
 src/lib/crypt_ops/crypto_curve25519.c  | 10 +-
 src/lib/crypt_ops/crypto_curve25519.h  |  4 ++--
 src/lib/crypt_ops/crypto_dh.c  | 10 +-
 src/lib/crypt_ops/crypto_digest.c  |  6 +++---
 src/lib/crypt_ops/crypto_ed25519.c | 12 ++--
 src/lib/crypt_ops/crypto_ed25519.h |  2 +-
 src/lib/crypt_ops/crypto_format.c  | 10 +-
 src/lib/crypt_ops/crypto_format.h  |  2 +-
 src/lib/crypt_ops/crypto_hkdf.c|  8 
 src/lib/crypt_ops/crypto_openssl_mgt.c |  4 ++--
 src/lib/crypt_ops/crypto_pwbox.c   | 12 ++--
 src/lib/crypt_ops/crypto_rand.c|  6 +++---
 src/lib/crypt_ops/crypto_rsa.c | 16 
 src/lib/crypt_ops/crypto_rsa.h |  2 +-
 src/lib/crypt_ops/crypto_s2k.c | 12 ++--
 src/lib/crypt_ops/crypto_util.c|  2 +-
 src/lib/tls/buffers_tls.c  |  4 ++--
 src/lib/tls/tortls.c   | 11 +--
 src/lib/tls/tortls.h   |  4 ++--
 src/or/addressmap.c|  2 +-
 src/or/channelpadding.c|  2 +-
 src/or/circpathbias.c  |  2 +-
 src/or/circuitbuild.c  |  2 +-
 src/or/circuitlist.c   |  4 ++--
 src/or/circuitmux_ewma.c   |  2 +-
 src/or/circuitstats.c  |  2 +-
 src/or/command.c   |  2 +-
 src/or/config.c|  4 ++--
 src/or/connection.c|  4 ++--
 src/or/connection_edge.c   |  2 +-
 src/or/connection_or.c |  4 ++--
 src/or/conscache.c |  2 +-
 src/or/control.c   |  6 +++---
 src/or/cpuworker.c |  4 ++--
 src/or/dirauth/shared_random.c |  4 ++--
 src/or/dirauth/shared_random_state.c   |  2 +-
 src/or/directory.c |  4 ++--
 src/or/dns.c   |  2 +-
 src/or/dos.c   |  2 +-
 src/or/entrynodes.c|  2 +-
 src/or/ext_orport.c|  4 ++--
 src/or/hibernate.c |  2 +-
 src/or/hs_cache.c  |  2 +-
 src/or/hs_cache.h  |  2 +-
 src/or/hs_cell.c   |  2 +-
 src/or/hs_circuit.c|  4 ++--
 src/or/hs_circuit.h|  2 +-
 src/or/hs_client.c |  4 ++--
 src/or/hs_client.h |  2 +-
 src/or/hs_common.c |  4 ++--
 src/or/hs_control.c|  2 +-
 src/or/hs_descriptor.c |  4 ++--
 src/or/hs_descriptor.h |  4 ++--
 src/or/hs_ident.c  |  2 +-
 src/or/hs_ident.h  |  2 +-
 src/or/hs_intropoint.h |  2 +-
 src/or/hs_ntor.c   |  2 +-
 src/or/hs_service.c|  4 ++--
 src/or/hs_service.h|  4 ++--
 src/or/keypin.c|  4 ++--
 src/or/main.c  |  6 +++---

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

[nickm]

commit b420da4cf80e9fc53db0a085514b9491b750812f
Author: Nick Mathewson 
Date:   Thu Jun 21 11:52:01 2018 -0400

Rectify include paths (automated)
---
 src/common/buffers.c |  2 +-
 src/common/buffers_tls.c |  2 +-
 src/lib/compress/compress.c  | 10 +-
 src/lib/compress/compress_lzma.c |  4 ++--
 src/lib/compress/compress_none.c |  4 ++--
 src/lib/compress/compress_zlib.c |  4 ++--
 src/lib/compress/compress_zstd.c |  4 ++--
 src/or/circuitlist.c |  6 +++---
 src/or/config.c  |  2 +-
 src/or/main.c|  2 +-
 src/or/or.h  |  2 +-
 src/or/relay.c   |  2 +-
 src/test/test.c  |  2 +-
 src/test/test_dir_handle_get.c   |  2 +-
 src/test/test_util.c |  2 +-
 15 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/common/buffers.c b/src/common/buffers.c
index 997bbdccc..fd029c26c 100644
--- a/src/common/buffers.c
+++ b/src/common/buffers.c
@@ -23,7 +23,7 @@
 #include 
 #include "common/buffers.h"
 #include "common/compat.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
 #include "common/util.h"
 #include "common/torint.h"
 #include "common/torlog.h"
diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c
index dfc8e44b9..c380369b5 100644
--- a/src/common/buffers_tls.c
+++ b/src/common/buffers_tls.c
@@ -10,7 +10,7 @@
 #include "common/buffers.h"
 #include "common/buffers_tls.h"
 #include "common/compat.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
 #include "common/util.h"
 #include "common/torint.h"
 #include "common/torlog.h"
diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c
index 44bb891af..0d0c8112e 100644
--- a/src/lib/compress/compress.c
+++ b/src/lib/compress/compress.c
@@ -21,11 +21,11 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_lzma.h"
-#include "common/compress_none.h"
-#include "common/compress_zlib.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_lzma.h"
+#include "lib/compress/compress_none.h"
+#include "lib/compress/compress_zlib.h"
+#include "lib/compress/compress_zstd.h"
 
 /** Total number of bytes allocated for compression state overhead. */
 static atomic_counter_t total_compress_allocation;
diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c
index 363dc1fb9..921aaa1d7 100644
--- a/src/lib/compress/compress_lzma.c
+++ b/src/lib/compress/compress_lzma.c
@@ -15,8 +15,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_lzma.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_lzma.h"
 
 #ifdef HAVE_LZMA
 #include 
diff --git a/src/lib/compress/compress_none.c b/src/lib/compress/compress_none.c
index 7e67046d3..05a27e5cc 100644
--- a/src/lib/compress/compress_none.c
+++ b/src/lib/compress/compress_none.c
@@ -18,8 +18,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_none.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_none.h"
 
 /** Transfer some bytes using the identity transformation.  Read up to
  * *in_len bytes from *in, and write up to *out_len bytes
diff --git a/src/lib/compress/compress_zlib.c b/src/lib/compress/compress_zlib.c
index 663e27f79..56dda8a2d 100644
--- a/src/lib/compress/compress_zlib.c
+++ b/src/lib/compress/compress_zlib.c
@@ -15,8 +15,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_zlib.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_zlib.h"
 
 /* zlib 1.2.4 and 1.2.5 do some "clever" things with macros.  Instead of
saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory
diff --git a/src/lib/compress/compress_zstd.c b/src/lib/compress/compress_zstd.c
index dc0dcdec9..37204ab5e 100644
--- a/src/lib/compress/compress_zstd.c
+++ b/src/lib/compress/compress_zstd.c
@@ -15,8 +15,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_zstd.h"
 
 #ifdef ENABLE_ZSTD_ADVANCED_APIS
 /* This is a lie, but we make sure it doesn't get us in trouble by wrapping
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index c3d017bf8..1af970040 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -86,9 +86,9 @@
 #include "or/routerlist.h"
 #include "or/routerset.h"
 #include "or/channelpadding.h"
-#include "common/compress_lzma.h"
-#include "common/compress_zlib.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress_lzma.h"
+#include "lib/compress/compress_zlib.h"
+#include "lib/compress/compress_zstd.h"
 
 #include "ht.h"
 
diff --git a/src/or/config.c b/src

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

[nickm]

commit 727db7aeb9e3e4355b9a2fd065f2b7e52f1082b1
Author: Nick Mathewson 
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 
 #include 
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. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 275aff6917260209dc53e553d895ec886f6c8c52
Author: Nick Mathewson 
Date:   Thu Jun 21 09:54:04 2018 -0400

Rectify include paths (automated)
---
 src/common/compat_time.c  | 2 +-
 src/common/log.c  | 2 +-
 src/common/sandbox.c  | 4 ++--
 src/common/util.c | 2 +-
 src/common/util.h | 2 +-
 src/common/util_bug.c | 2 +-
 src/lib/err/backtrace.c   | 6 +++---
 src/lib/err/torerr.c  | 4 ++--
 src/or/connection.c   | 2 +-
 src/or/connection_edge.c  | 2 +-
 src/or/directory.c| 2 +-
 src/or/main.c | 2 +-
 src/or/relay.c| 2 +-
 src/or/routerlist.c   | 2 +-
 src/test/fuzz/fuzz_http.c | 2 +-
 src/test/fuzz/fuzz_http_connect.c | 2 +-
 src/test/fuzz/fuzzing_common.c| 2 +-
 src/test/test.c   | 2 +-
 src/test/test_bt_cl.c | 2 +-
 src/test/test_logging.c   | 2 +-
 src/test/testing_common.c | 2 +-
 21 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index 913fa666e..da323e55a 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -34,7 +34,7 @@
 #include 
 #endif
 
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 #include "common/torlog.h"
 #include "common/util.h"
 #include "common/container.h"
diff --git a/src/common/log.c b/src/common/log.c
index 6dba5bf4b..928a3fba8 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -34,7 +34,7 @@
 #define LOG_PRIVATE
 #include "common/torlog.h"
 #include "common/container.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 
 #ifdef HAVE_ANDROID_LOG_H
 #include 
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 3679037f8..4fc132730 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -34,7 +34,7 @@
 
 #include "common/sandbox.h"
 #include "common/container.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 #include "common/torlog.h"
 #include "common/torint.h"
 #include "common/util.h"
@@ -80,7 +80,7 @@
   defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION)
 #define USE_BACKTRACE
 #define EXPOSE_CLEAN_BACKTRACE
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #endif /* defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && ... */
 
 #ifdef USE_BACKTRACE
diff --git a/src/common/util.c b/src/common/util.c
index 664ab34d2..de46cc7c8 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -21,7 +21,7 @@
 #include "common/container.h"
 #include "common/address.h"
 #include "common/sandbox.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "common/util_process.h"
 #include "common/util_format.h"
 
diff --git a/src/common/util.h b/src/common/util.h
index a5e6c4d46..8761e455f 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -22,7 +22,7 @@
 /* for the correct alias to struct stat */
 #include 
 #endif
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 #include "common/util_bug.h"
 
 #ifndef O_BINARY
diff --git a/src/common/util_bug.c b/src/common/util_bug.c
index da34201c1..5cfd00649 100644
--- a/src/common/util_bug.c
+++ b/src/common/util_bug.c
@@ -10,7 +10,7 @@
 #include "orconfig.h"
 #include "common/util_bug.h"
 #include "common/torlog.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "common/container.h"
 
 #ifdef __COVERITY__
diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c
index d83cbba0e..cded6459f 100644
--- a/src/lib/err/backtrace.c
+++ b/src/lib/err/backtrace.c
@@ -14,7 +14,7 @@
  */
 
 #include "orconfig.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 
 #ifdef HAVE_EXECINFO_H
 #include 
@@ -45,8 +45,8 @@
 #endif
 
 #define EXPOSE_CLEAN_BACKTRACE
-#include "common/backtrace.h"
-#include "common/torerr.h"
+#include "lib/err/backtrace.h"
+#include "lib/err/torerr.h"
 
 #if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \
   defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION)
diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c
index 0e0c4db35..81f360596 100644
--- a/src/lib/err/torerr.c
+++ b/src/lib/err/torerr.c
@@ -28,8 +28,8 @@
 #include 
 #endif
 
-#include "common/torerr.h"
-#include "common/backtrace.h"
+#include "lib/err/torerr.h"
+#include "lib/err/backtrace.h"
 
 /** Array of fds to log crash-style warnings to. */
 static int sigsafe_log_fds[TOR_SIGSAFE_LOG_MAX_FDS] = { STDERR_FILENO };
diff --git a/src/or/connection.c b/src/or/connection.c
index 267719881..450903d6d 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -65,7 +65,7 @@
  */
 #define TOR_CHANNEL_INTERNAL_
 #define CONNECTION_PRIVATE
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/circuitbuild.h"
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 125709786..6d6279c83 100644
--- a/

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

[nickm]

commit da728e36f45799077a8d24a0be95ab5db78593f4
Author: Nick Mathewson 
Date:   Thu Jun 21 09:55:16 2018 -0400

Rectify include paths (automated)
---
 src/common/crypto_hkdf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/crypto_hkdf.c b/src/common/crypto_hkdf.c
index dd29c73ce..8dc15b6ff 100644
--- a/src/common/crypto_hkdf.c
+++ b/src/common/crypto_hkdf.c
@@ -13,7 +13,7 @@
 #include "common/crypto_util.h"
 #include "common/crypto_digest.h"
 
-#include "crypto_openssl_mgt.h"
+#include "common/crypto_openssl_mgt.h"
 #include 
 
 #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits