diff options
47 files changed, 48 insertions, 48 deletions
diff --git a/src/common/address.h b/src/common/address.h index 2c9c620c2a..317c7f329c 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -13,7 +13,7 @@ //#include <sys/sockio.h> #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 f4986c9b02..cfee89cfb8 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 fd029c26c8..41f98ddf7c 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 <unistd.h> diff --git a/src/common/buffers.h b/src/common/buffers.h index 5cd9d3ec67..5956e3484b 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 c380369b51..0a57b95529 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 da9bd8bcc4..0cc257fc9c 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 <sys/param.h> @@ -45,7 +45,7 @@ #include <netinet6/in6.h> #endif -#include "common/compat_compiler.h" +#include "lib/cc/compat_compiler.h" #include "common/compat_time.h" #include <stdio.h> diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h index 5d3883043d..ed0ece5ab9 100644 --- a/src/common/compat_threads.h +++ b/src/common/compat_threads.h @@ -7,7 +7,7 @@ #define TOR_COMPAT_THREADS_H #include "orconfig.h" -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/testsupport.h" #if defined(HAVE_PTHREAD_H) && !defined(_WIN32) diff --git a/src/common/crypto.c b/src/common/crypto.c index 57eb9c64c9..8a8bb2b770 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -63,7 +63,7 @@ ENABLE_GCC_WARNING(redundant-decls) #endif #include "common/torlog.h" -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/aes.h" #include "common/util.h" #include "common/container.h" diff --git a/src/common/crypto.h b/src/common/crypto.h index e7d86eaf01..1324468097 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -16,7 +16,7 @@ #include "orconfig.h" #include <stdio.h> -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/compat.h" #include "common/util.h" #include "common/crypto_rsa.h" diff --git a/src/common/crypto_curve25519.h b/src/common/crypto_curve25519.h index 96d2e0e072..8a5b9b2018 100644 --- a/src/common/crypto_curve25519.h +++ b/src/common/crypto_curve25519.h @@ -5,7 +5,7 @@ #define TOR_CRYPTO_CURVE25519_H #include "common/testsupport.h" -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/crypto_digest.h" #include "common/crypto_openssl_mgt.h" diff --git a/src/common/crypto_digest.h b/src/common/crypto_digest.h index 25ca5ceda7..96ac038507 100644 --- a/src/common/crypto_digest.h +++ b/src/common/crypto_digest.h @@ -16,7 +16,7 @@ #include <stdio.h> #include "common/container.h" -#include "common/torint.h" +#include "lib/cc/torint.h" /** Length of the output of our message digest. */ #define DIGEST_LEN 20 diff --git a/src/common/crypto_ed25519.h b/src/common/crypto_ed25519.h index 20c04226e3..981b0dce28 100644 --- a/src/common/crypto_ed25519.h +++ b/src/common/crypto_ed25519.h @@ -5,7 +5,7 @@ #define TOR_CRYPTO_ED25519_H #include "common/testsupport.h" -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/crypto_curve25519.h" #include "common/util.h" diff --git a/src/common/crypto_format.h b/src/common/crypto_format.h index 325b1ef44d..47f52b94b7 100644 --- a/src/common/crypto_format.h +++ b/src/common/crypto_format.h @@ -8,7 +8,7 @@ #define TOR_CRYPTO_FORMAT_H #include "common/testsupport.h" -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/crypto_ed25519.h" int crypto_write_tagged_contents_to_file(const char *fname, diff --git a/src/common/crypto_pwbox.h b/src/common/crypto_pwbox.h index 2c73c700eb..9ed35a150e 100644 --- a/src/common/crypto_pwbox.h +++ b/src/common/crypto_pwbox.h @@ -4,7 +4,7 @@ #ifndef CRYPTO_PWBOX_H_INCLUDED_ #define CRYPTO_PWBOX_H_INCLUDED_ -#include "common/torint.h" +#include "lib/cc/torint.h" #define UNPWBOX_OKAY 0 #define UNPWBOX_BAD_SECRET -1 diff --git a/src/common/crypto_rand.h b/src/common/crypto_rand.h index 2e05adc93d..8309bb21ca 100644 --- a/src/common/crypto_rand.h +++ b/src/common/crypto_rand.h @@ -13,7 +13,7 @@ #ifndef TOR_CRYPTO_RAND_H #define TOR_CRYPTO_RAND_H -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/util.h" /* random numbers */ diff --git a/src/common/crypto_rsa.h b/src/common/crypto_rsa.h index c56eab319a..a80c46bb9f 100644 --- a/src/common/crypto_rsa.h +++ b/src/common/crypto_rsa.h @@ -17,7 +17,7 @@ #include "common/crypto_digest.h" #include <stdio.h> -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/testsupport.h" #include "common/compat.h" #include "common/util.h" diff --git a/src/common/crypto_s2k.h b/src/common/crypto_s2k.h index bc7224e8ea..b270897b68 100644 --- a/src/common/crypto_s2k.h +++ b/src/common/crypto_s2k.h @@ -8,7 +8,7 @@ #define TOR_CRYPTO_S2K_H_INCLUDED #include <stdio.h> -#include "common/torint.h" +#include "lib/cc/torint.h" /** Length of RFC2440-style S2K specifier: the first 8 bytes are a salt, the * 9th describes how much iteration to do. */ diff --git a/src/common/crypto_util.h b/src/common/crypto_util.h index 53d9027fbc..3ce34e6f23 100644 --- a/src/common/crypto_util.h +++ b/src/common/crypto_util.h @@ -13,7 +13,7 @@ #ifndef TOR_CRYPTO_UTIL_H #define TOR_CRYPTO_UTIL_H -#include "common/torint.h" +#include "lib/cc/torint.h" /** OpenSSL-based utility functions. */ void memwipe(void *mem, uint8_t byte, size_t sz); diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 4fc1327307..a33463f74b 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -36,7 +36,7 @@ #include "common/container.h" #include "lib/err/torerr.h" #include "common/torlog.h" -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/util.h" #include "tor_queue.h" diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 945d57df7e..f7c990e013 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -13,7 +13,7 @@ #define SANDBOX_H_ #include "orconfig.h" -#include "common/torint.h" +#include "lib/cc/torint.h" #ifndef SYS_SECCOMP diff --git a/src/common/token_bucket.h b/src/common/token_bucket.h index 645c90c624..fd6834f262 100644 --- a/src/common/token_bucket.h +++ b/src/common/token_bucket.h @@ -9,7 +9,7 @@ #ifndef TOR_TOKEN_BUCKET_H #define TOR_TOKEN_BUCKET_H -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/testsupport.h" /** Largest allowable burst value for a token buffer. */ diff --git a/src/common/util.c b/src/common/util.c index de46cc7c87..f9d64cfb90 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -17,7 +17,7 @@ #include "common/util.h" #include "common/torlog.h" #include "common/crypto_digest.h" -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/container.h" #include "common/address.h" #include "common/sandbox.h" diff --git a/src/common/util.h b/src/common/util.h index b3c17db248..cb8cefb12c 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -12,7 +12,7 @@ #define TOR_UTIL_H #include "orconfig.h" -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/compat.h" #include "lib/ctime/di_ops.h" #include "common/testsupport.h" diff --git a/src/common/util_format.c b/src/common/util_format.c index cab2572343..420d8a1a8f 100644 --- a/src/common/util_format.c +++ b/src/common/util_format.c @@ -15,7 +15,7 @@ #include "common/torlog.h" #include "common/util.h" #include "common/util_format.h" -#include "common/torint.h" +#include "lib/cc/torint.h" #include <stddef.h> #include <string.h> diff --git a/src/common/util_format.h b/src/common/util_format.h index 7dd5ae5bd8..e49efd05c2 100644 --- a/src/common/util_format.h +++ b/src/common/util_format.h @@ -8,7 +8,7 @@ #define TOR_UTIL_FORMAT_H #include "common/testsupport.h" -#include "common/torint.h" +#include "lib/cc/torint.h" /** @{ */ /** These macros don't check for overflow. Use them only for constant inputs diff --git a/src/ext/OpenBSD_malloc_Linux.c b/src/ext/OpenBSD_malloc_Linux.c index 157462b9ac..9c30570c41 100644 --- a/src/ext/OpenBSD_malloc_Linux.c +++ b/src/ext/OpenBSD_malloc_Linux.c @@ -59,7 +59,7 @@ #include <errno.h> #include <err.h> /* For SIZE_MAX */ -#include "common/torint.h" +#include "lib/cc/torint.h" //#include "thread_private.h" diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index 36c3dee76e..f82e10b103 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -29,7 +29,7 @@ Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c) */ -#include "common/torint.h" +#include "lib/cc/torint.h" #include "siphash.h" /* for tor_assert */ #include "common/util.h" diff --git a/src/ext/curve25519_donna/curve25519-donna-c64.c b/src/ext/curve25519_donna/curve25519-donna-c64.c index d2d7fb434a..45da7bf1e6 100644 --- a/src/ext/curve25519_donna/curve25519-donna-c64.c +++ b/src/ext/curve25519_donna/curve25519-donna-c64.c @@ -25,7 +25,7 @@ #include "orconfig.h" #include <string.h> -#include "common/torint.h" +#include "lib/cc/torint.h" typedef uint8_t u8; typedef uint64_t limb; diff --git a/src/ext/curve25519_donna/curve25519-donna.c b/src/ext/curve25519_donna/curve25519-donna.c index 573e6e26a9..d64b95c113 100644 --- a/src/ext/curve25519_donna/curve25519-donna.c +++ b/src/ext/curve25519_donna/curve25519-donna.c @@ -48,7 +48,7 @@ #include "orconfig.h" #include <string.h> -#include "common/torint.h" +#include "lib/cc/torint.h" typedef uint8_t u8; typedef int32_t s32; diff --git a/src/ext/ed25519/donna/ed25519_donna_tor.h b/src/ext/ed25519/donna/ed25519_donna_tor.h index dfaefc8658..20e9b5e99c 100644 --- a/src/ext/ed25519/donna/ed25519_donna_tor.h +++ b/src/ext/ed25519/donna/ed25519_donna_tor.h @@ -1,7 +1,7 @@ /* Added for Tor. */ #ifndef SRC_EXT_ED25519_DONNA_H_INCLUDED_ #define SRC_EXT_ED25519_DONNA_H_INCLUDED_ -#include "common/torint.h" +#include "lib/cc/torint.h" typedef unsigned char curved25519_key[32]; diff --git a/src/ext/ed25519/ref10/crypto_int32.h b/src/ext/ed25519/ref10/crypto_int32.h index 59311a6201..26271e917b 100644 --- a/src/ext/ed25519/ref10/crypto_int32.h +++ b/src/ext/ed25519/ref10/crypto_int32.h @@ -3,7 +3,7 @@ #ifndef CRYPTO_INT32_H #define CRYPTO_INT32_H -#include "common/torint.h" +#include "lib/cc/torint.h" #define crypto_int32 int32_t #define crypto_uint32 uint32_t diff --git a/src/ext/ed25519/ref10/crypto_int64.h b/src/ext/ed25519/ref10/crypto_int64.h index 6dda30f2ed..3b066a9c0c 100644 --- a/src/ext/ed25519/ref10/crypto_int64.h +++ b/src/ext/ed25519/ref10/crypto_int64.h @@ -3,7 +3,7 @@ #ifndef CRYPTO_INT64_H #define CRYPTO_INT64_H -#include "common/torint.h" +#include "lib/cc/torint.h" #define crypto_int64 int64_t #define crypto_uint64 uint64_t diff --git a/src/ext/ed25519/ref10/crypto_uint32.h b/src/ext/ed25519/ref10/crypto_uint32.h index b12a595a10..a7a77723bd 100644 --- a/src/ext/ed25519/ref10/crypto_uint32.h +++ b/src/ext/ed25519/ref10/crypto_uint32.h @@ -1,3 +1,3 @@ /* Added for Tor. */ -#include "common/torint.h" +#include "lib/cc/torint.h" #define crypto_uint32 uint32_t diff --git a/src/ext/ed25519/ref10/crypto_uint64.h b/src/ext/ed25519/ref10/crypto_uint64.h index 73edfd1b5e..adaaa08042 100644 --- a/src/ext/ed25519/ref10/crypto_uint64.h +++ b/src/ext/ed25519/ref10/crypto_uint64.h @@ -1,3 +1,3 @@ /* Added for Tor. */ -#include "common/torint.h" +#include "lib/cc/torint.h" #define crypto_uint64 uint64_t diff --git a/src/ext/ed25519/ref10/ed25519_ref10.h b/src/ext/ed25519/ref10/ed25519_ref10.h index 15ac07e241..bb72af6c0b 100644 --- a/src/ext/ed25519/ref10/ed25519_ref10.h +++ b/src/ext/ed25519/ref10/ed25519_ref10.h @@ -1,7 +1,7 @@ /* Added for Tor */ #ifndef SRC_EXT_ED25519_REF10_H_INCLUDED_ #define SRC_EXT_ED25519_REF10_H_INCLUDED_ -#include "common/torint.h" +#include "lib/cc/torint.h" int ed25519_ref10_seckey(unsigned char *sk); int ed25519_ref10_seckey_expand(unsigned char *sk, const unsigned char *sk_seed); diff --git a/src/ext/keccak-tiny/keccak-tiny.h b/src/ext/keccak-tiny/keccak-tiny.h index 58e1d45342..a9c8ed6420 100644 --- a/src/ext/keccak-tiny/keccak-tiny.h +++ b/src/ext/keccak-tiny/keccak-tiny.h @@ -2,7 +2,7 @@ #define KECCAK_FIPS202_H #include <stddef.h> -#include "common/torint.h" +#include "lib/cc/torint.h" #define KECCAK_MAX_RATE 200 diff --git a/src/ext/mulodi/mulodi4.c b/src/ext/mulodi/mulodi4.c index ddd17cd1dd..accce1ce01 100644 --- a/src/ext/mulodi/mulodi4.c +++ b/src/ext/mulodi/mulodi4.c @@ -18,7 +18,7 @@ #define COMPILER_RT_ABI #define di_int int64_t #define di_uint uint64_t -#include "common/torint.h" +#include "lib/cc/torint.h" di_int __mulodi4(di_int a, di_int b, int* overflow); #endif diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c index 0d0c8112e2..cb130b693b 100644 --- a/src/lib/compress/compress.c +++ b/src/lib/compress/compress.c @@ -13,7 +13,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include "common/torint.h" +#include "lib/cc/torint.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> diff --git a/src/lib/ctime/di_ops.h b/src/lib/ctime/di_ops.h index 8298bfa73a..92af7ae278 100644 --- a/src/lib/ctime/di_ops.h +++ b/src/lib/ctime/di_ops.h @@ -12,7 +12,7 @@ #define TOR_DI_OPS_H #include "orconfig.h" -#include "common/torint.h" +#include "lib/cc/torint.h" int tor_memcmp(const void *a, const void *b, size_t sz); int tor_memeq(const void *a, const void *b, size_t sz); diff --git a/src/lib/err/backtrace.h b/src/lib/err/backtrace.h index 0a145fc92d..7f77428436 100644 --- a/src/lib/err/backtrace.h +++ b/src/lib/err/backtrace.h @@ -5,7 +5,7 @@ #define TOR_BACKTRACE_H #include "orconfig.h" -#include "common/compat_compiler.h" +#include "lib/cc/compat_compiler.h" typedef void (*tor_log_fn)(int, unsigned, const char *fmt, ...) CHECK_PRINTF(3,4); diff --git a/src/lib/err/torerr.h b/src/lib/err/torerr.h index 10d9f481c0..d4bba6916f 100644 --- a/src/lib/err/torerr.h +++ b/src/lib/err/torerr.h @@ -13,7 +13,7 @@ #ifndef TOR_TORERR_H #define TOR_TORERR_H -#include "common/compat_compiler.h" +#include "lib/cc/compat_compiler.h" /* The raw_assert...() variants are for use within code that can't call * tor_assertion_failed_() because of call circularity issues. */ diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 1af970040d..9f64a1a20f 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -51,7 +51,7 @@ * logic, which was originally circuit-focused. **/ #define CIRCUITLIST_PRIVATE -#include "common/torint.h" /* TOR_PRIuSZ */ +#include "lib/cc/torint.h" /* TOR_PRIuSZ */ #include "or/or.h" #include "or/channel.h" diff --git a/src/or/dir_server_st.h b/src/or/dir_server_st.h index 8fdb04a7de..fe1f5c3d5f 100644 --- a/src/or/dir_server_st.h +++ b/src/or/dir_server_st.h @@ -7,7 +7,7 @@ #ifndef DIR_SERVER_ST_H #define DIR_SERVER_ST_H -#include "common/torint.h" +#include "lib/cc/torint.h" #include "or/or.h" #include "or/routerstatus_st.h" diff --git a/src/or/entry_port_cfg_st.h b/src/or/entry_port_cfg_st.h index 45dd844c46..9b07ccb067 100644 --- a/src/or/entry_port_cfg_st.h +++ b/src/or/entry_port_cfg_st.h @@ -7,7 +7,7 @@ #ifndef ENTRY_PORT_CFG_ST_H #define ENTRY_PORT_CFG_ST_H -#include "common/torint.h" +#include "lib/cc/torint.h" #include "or/or.h" struct entry_port_cfg_t { diff --git a/src/or/keypin.c b/src/or/keypin.c index 921a401a4f..17b5010fa5 100644 --- a/src/or/keypin.c +++ b/src/or/keypin.c @@ -18,7 +18,7 @@ #include "ht.h" #include "or/keypin.h" #include "siphash.h" -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/torlog.h" #include "common/util.h" #include "common/util_format.h" diff --git a/src/or/onion_ntor.h b/src/or/onion_ntor.h index 13a3298ac0..0dd66f1e87 100644 --- a/src/or/onion_ntor.h +++ b/src/or/onion_ntor.h @@ -4,7 +4,7 @@ #ifndef TOR_ONION_NTOR_H #define TOR_ONION_NTOR_H -#include "common/torint.h" +#include "lib/cc/torint.h" #include "common/crypto_curve25519.h" #include "lib/ctime/di_ops.h" diff --git a/src/or/or.h b/src/or/or.h index 66e69f3caa..53dc896072 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -26,7 +26,7 @@ #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> /* FreeBSD needs this to know what version it is */ #endif -#include "common/torint.h" +#include "lib/cc/torint.h" #ifdef HAVE_SYS_FCNTL_H #include <sys/fcntl.h> #endif |