tor-commits June 2018

tor-commits@lists.torproject.org

16 participants
2190 discussions

[tor/master] Rectify include paths (automated)
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit fa5fda5bbfd1c3ebcd9f01d0d86509c68dfd4268 Author: Nick Mathewson <nickm(a)torproject.org> 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 <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 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 <unistd.h> 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 <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 5d3883043..ed0ece5ab 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 57eb9c64c..8a8bb2b77 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 e7d86eaf0..132446809 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 96d2e0e07..8a5b9b201 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 25ca5ceda..96ac03850 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 20c04226e..981b0dce2 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 325b1ef44..47f52b94b 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 2c73c700e..9ed35a150 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 2e05adc93..8309bb21c 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 c56eab319..a80c46bb9 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 bc7224e8e..b270897b6 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 53d9027fb..3ce34e6f2 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 4fc132730..a33463f74 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 945d57df7..f7c990e01 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 645c90c62..fd6834f26 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 de46cc7c8..f9d64cfb9 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 b3c17db24..cb8cefb12 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 cab257234..420d8a1a8 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 7dd5ae5bd..e49efd05c 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 157462b9a..9c30570c4 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 36c3dee76..f82e10b10 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 d2d7fb434..45da7bf1e 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 573e6e26a..d64b95c11 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 dfaefc865..20e9b5e99 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 59311a620..26271e917 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 6dda30f2e..3b066a9c0 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 b12a595a1..a7a77723b 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 73edfd1b5..adaaa0804 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 15ac07e24..bb72af6c0 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 58e1d4534..a9c8ed642 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 ddd17cd1d..accce1ce0 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 0d0c8112e..cb130b693 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 8298bfa73..92af7ae27 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 0a145fc92..7f7742843 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 10d9f481c..d4bba6916 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 1af970040..9f64a1a20 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 8fdb04a7d..fe1f5c3d5 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 45dd844c4..9b07ccb06 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 921a401a4..17b5010fa 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 13a3298ac..0dd66f1e8 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 66e69f3ca..53dc89607 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

1 0

[tor/master] Move more compiler-compatibility stuff into compat_compiler.h
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 49d7c9ce53daa13daae59eedceb07d28e06e4395 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 12:29:34 2018 -0400 Move more compiler-compatibility stuff into compat_compiler.h --- src/common/compat.h | 48 -------------------------------------------- src/include.am | 1 + src/lib/cc/compat_compiler.h | 48 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 0cc257fc9..654f10390 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -78,54 +78,6 @@ size_t strlcat(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2)); size_t strlcpy(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2)); #endif -#ifdef _MSC_VER -/** Casts the uint64_t value in a to the right type for an argument - * to printf. */ -#define U64_PRINTF_ARG(a) (a) -/** Casts the uint64_t* value in a to the right type for an argument - * to scanf. */ -#define U64_SCANF_ARG(a) (a) -/** Expands to a literal uint64_t-typed constant for the value n. */ -#define U64_LITERAL(n) (n ## ui64) -#define I64_PRINTF_ARG(a) (a) -#define I64_SCANF_ARG(a) (a) -#define I64_LITERAL(n) (n ## i64) -#else /* !(defined(_MSC_VER)) */ -#define U64_PRINTF_ARG(a) ((long long unsigned int)(a)) -#define U64_SCANF_ARG(a) ((long long unsigned int*)(a)) -#define U64_LITERAL(n) (n ## llu) -#define I64_PRINTF_ARG(a) ((long long signed int)(a)) -#define I64_SCANF_ARG(a) ((long long signed int*)(a)) -#define I64_LITERAL(n) (n ## ll) -#endif /* defined(_MSC_VER) */ - -#if defined(__MINGW32__) || defined(__MINGW64__) -#define MINGW_ANY -#endif - -#if defined(_MSC_VER) || defined(MINGW_ANY) -/** The formatting string used to put a uint64_t value in a printf() or - * scanf() function. See also U64_PRINTF_ARG and U64_SCANF_ARG. */ -#define U64_FORMAT "%I64u" -#define I64_FORMAT "%I64d" -#else /* !(defined(_MSC_VER) || defined(MINGW_ANY)) */ -#define U64_FORMAT "%llu" -#define I64_FORMAT "%lld" -#endif /* defined(_MSC_VER) || defined(MINGW_ANY) */ - -#if (SIZEOF_INTPTR_T == SIZEOF_INT) -#define INTPTR_T_FORMAT "%d" -#define INTPTR_PRINTF_ARG(x) ((int)(x)) -#elif (SIZEOF_INTPTR_T == SIZEOF_LONG) -#define INTPTR_T_FORMAT "%ld" -#define INTPTR_PRINTF_ARG(x) ((long)(x)) -#elif (SIZEOF_INTPTR_T == 8) -#define INTPTR_T_FORMAT I64_FORMAT -#define INTPTR_PRINTF_ARG(x) I64_PRINTF_ARG(x) -#else -#error Unknown: SIZEOF_INTPTR_T -#endif /* (SIZEOF_INTPTR_T == SIZEOF_INT) || ... */ - /** Represents an mmaped file. Allocated via tor_mmap_file; freed with * tor_munmap_file. */ typedef struct tor_mmap_t { diff --git a/src/include.am b/src/include.am index 974d572e2..d4b348b4e 100644 --- a/src/include.am +++ b/src/include.am @@ -1,5 +1,6 @@ include src/ext/include.am include src/lib/err/include.am +include src/lib/cc/include.am include src/lib/ctime/include.am include src/lib/compress/include.am include src/lib/trace/include.am diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h index a9a326616..31e84bcc5 100644 --- a/src/lib/cc/compat_compiler.h +++ b/src/lib/cc/compat_compiler.h @@ -194,4 +194,52 @@ #define OP_EQ == #define OP_NE != +#ifdef _MSC_VER +/** Casts the uint64_t value in a to the right type for an argument + * to printf. */ +#define U64_PRINTF_ARG(a) (a) +/** Casts the uint64_t* value in a to the right type for an argument + * to scanf. */ +#define U64_SCANF_ARG(a) (a) +/** Expands to a literal uint64_t-typed constant for the value n. */ +#define U64_LITERAL(n) (n ## ui64) +#define I64_PRINTF_ARG(a) (a) +#define I64_SCANF_ARG(a) (a) +#define I64_LITERAL(n) (n ## i64) +#else /* !(defined(_MSC_VER)) */ +#define U64_PRINTF_ARG(a) ((long long unsigned int)(a)) +#define U64_SCANF_ARG(a) ((long long unsigned int*)(a)) +#define U64_LITERAL(n) (n ## llu) +#define I64_PRINTF_ARG(a) ((long long signed int)(a)) +#define I64_SCANF_ARG(a) ((long long signed int*)(a)) +#define I64_LITERAL(n) (n ## ll) +#endif /* defined(_MSC_VER) */ + +#if defined(__MINGW32__) || defined(__MINGW64__) +#define MINGW_ANY +#endif + +#if defined(_MSC_VER) || defined(MINGW_ANY) +/** The formatting string used to put a uint64_t value in a printf() or + * scanf() function. See also U64_PRINTF_ARG and U64_SCANF_ARG. */ +#define U64_FORMAT "%I64u" +#define I64_FORMAT "%I64d" +#else /* !(defined(_MSC_VER) || defined(MINGW_ANY)) */ +#define U64_FORMAT "%llu" +#define I64_FORMAT "%lld" +#endif /* defined(_MSC_VER) || defined(MINGW_ANY) */ + +#if (SIZEOF_INTPTR_T == SIZEOF_INT) +#define INTPTR_T_FORMAT "%d" +#define INTPTR_PRINTF_ARG(x) ((int)(x)) +#elif (SIZEOF_INTPTR_T == SIZEOF_LONG) +#define INTPTR_T_FORMAT "%ld" +#define INTPTR_PRINTF_ARG(x) ((long)(x)) +#elif (SIZEOF_INTPTR_T == 8) +#define INTPTR_T_FORMAT I64_FORMAT +#define INTPTR_PRINTF_ARG(x) I64_PRINTF_ARG(x) +#else +#error Unknown: SIZEOF_INTPTR_T +#endif /* (SIZEOF_INTPTR_T == SIZEOF_INT) || ... */ + #endif /* !defined(TOR_COMPAT_H) */

1 0

[tor/master] Rectify include paths (automated)
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit accf239fa3e84451711a25a96ddb13877fd9fcfa Author: Nick Mathewson <nickm(a)torproject.org> 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 +++--- src/or/networkstatus.c | 4 ++-- src/or/onion.c | 2 +- src/or/onion_fast.c | 4 ++-- src/or/onion_ntor.c | 8 ++++---- src/or/onion_ntor.h | 2 +- src/or/onion_tap.c | 4 ++-- src/or/or.h | 14 +++++++------- src/or/parsecommon.h | 2 +- src/or/proto_socks.c | 2 +- src/or/relay.c | 4 ++-- src/or/relay_crypto.c | 2 +- src/or/rendclient.c | 4 ++-- src/or/rendcommon.c | 4 ++-- src/or/rendmid.c | 2 +- src/or/rendservice.c | 4 ++-- src/or/rephist.c | 2 +- src/or/router.c | 6 +++--- src/or/routerkeys.c | 4 ++-- src/or/routerkeys.h | 2 +- src/or/routerlist.c | 4 ++-- src/or/routerparse.c | 2 +- src/or/torcert.c | 2 +- src/or/torcert.h | 2 +- src/test/bench.c | 6 +++--- src/test/fuzz/fuzz_hsdescv3.c | 2 +- src/test/fuzz/fuzzing_common.c | 4 ++-- src/test/hs_test_helpers.c | 2 +- src/test/rend_test_helpers.c | 2 +- src/test/test-memwipe.c | 2 +- src/test/test-timers.c | 2 +- src/test/test.c | 4 ++-- src/test/test_addr.c | 2 +- src/test/test_address_set.c | 2 +- src/test/test_buffers.c | 4 ++-- src/test/test_cell_formats.c | 2 +- src/test/test_channel.c | 2 +- src/test/test_channeltls.c | 2 +- src/test/test_consdiffmgr.c | 2 +- src/test/test_containers.c | 2 +- src/test/test_crypto.c | 8 ++++---- src/test/test_crypto_openssl.c | 4 ++-- src/test/test_crypto_slow.c | 6 +++--- src/test/test_dir.c | 4 ++-- src/test/test_dos.c | 2 +- src/test/test_entrynodes.c | 2 +- src/test/test_extorport.c | 2 +- src/test/test_helpers.c | 2 +- src/test/test_hs_cell.c | 4 ++-- src/test/test_hs_client.c | 2 +- src/test/test_hs_common.c | 2 +- src/test/test_hs_descriptor.c | 6 +++--- src/test/test_hs_intropoint.c | 2 +- src/test/test_hs_ntor_cl.c | 4 ++-- src/test/test_hs_service.c | 2 +- src/test/test_introduce.c | 2 +- src/test/test_nodelist.c | 2 +- src/test/test_ntor_cl.c | 4 ++-- src/test/test_oom.c | 2 +- src/test/test_relaycell.c | 2 +- src/test/test_relaycrypt.c | 2 +- src/test/test_router.c | 4 ++-- src/test/test_routerkeys.c | 2 +- src/test/test_routerlist.c | 2 +- src/test/test_shared_random.c | 2 +- src/test/test_storagedir.c | 2 +- src/test/test_tortls.c | 2 +- src/test/test_util.c | 2 +- src/test/test_util_format.c | 2 +- src/test/test_util_slow.c | 2 +- src/test/test_workqueue.c | 4 ++-- src/test/testing_common.c | 2 +- src/test/testing_rsakeys.c | 2 +- src/tools/tor-gencert.c | 8 ++++---- 151 files changed, 275 insertions(+), 276 deletions(-) diff --git a/src/common/address_set.c b/src/common/address_set.c index 763db6428..65c4cbf1e 100644 --- a/src/common/address_set.c +++ b/src/common/address_set.c @@ -15,7 +15,7 @@ #include "common/address.h" #include "common/compat.h" #include "common/container.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "common/util.h" #include "siphash.h" diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index c99de1ac3..e3216bfc4 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -11,7 +11,7 @@ #define COMPAT_LIBEVENT_PRIVATE #include "common/compat_libevent.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "common/util.h" #include "common/torlog.h" diff --git a/src/common/container.c b/src/common/container.c index c66ea012a..c30e84ba2 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -15,7 +15,7 @@ #include "common/util.h" #include "common/torlog.h" #include "common/container.h" -#include "common/crypto_digest.h" +#include "lib/crypt_ops/crypto_digest.h" #include <stdlib.h> #include <string.h> diff --git a/src/common/util.c b/src/common/util.c index f9d64cfb9..fd1bb815d 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -16,7 +16,7 @@ #define UTIL_PRIVATE #include "common/util.h" #include "common/torlog.h" -#include "common/crypto_digest.h" +#include "lib/crypt_ops/crypto_digest.h" #include "lib/cc/torint.h" #include "common/container.h" #include "common/address.h" diff --git a/src/common/workqueue.c b/src/common/workqueue.c index 0d31a2ecc..be51e4f10 100644 --- a/src/common/workqueue.c +++ b/src/common/workqueue.c @@ -27,7 +27,7 @@ #include "common/compat.h" #include "common/compat_libevent.h" #include "common/compat_threads.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "common/util.h" #include "common/workqueue.h" #include "tor_queue.h" diff --git a/src/ext/ed25519/donna/ed25519-hash-custom.h b/src/ext/ed25519/donna/ed25519-hash-custom.h index c17649991..ff8bbde3d 100644 --- a/src/ext/ed25519/donna/ed25519-hash-custom.h +++ b/src/ext/ed25519/donna/ed25519-hash-custom.h @@ -9,7 +9,7 @@ void ed25519_hash(uint8_t *hash, const uint8_t *in, size_t inlen); */ -#include "common/crypto_digest.h" +#include "lib/crypt_ops/crypto_digest.h" typedef struct ed25519_hash_context { crypto_digest_t *ctx; diff --git a/src/ext/ed25519/donna/ed25519-randombytes-custom.h b/src/ext/ed25519/donna/ed25519-randombytes-custom.h index ea7a649cd..d92a51d1d 100644 --- a/src/ext/ed25519/donna/ed25519-randombytes-custom.h +++ b/src/ext/ed25519/donna/ed25519-randombytes-custom.h @@ -8,7 +8,7 @@ */ /* Tor: Instead of calling OpenSSL's CSPRNG directly, call the wrapper. */ -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" static void ED25519_FN(ed25519_randombytes_unsafe) (void *p, size_t len) diff --git a/src/ext/ed25519/donna/ed25519_tor.c b/src/ext/ed25519/donna/ed25519_tor.c index c3d4e09cd..7f5ab398d 100644 --- a/src/ext/ed25519/donna/ed25519_tor.c +++ b/src/ext/ed25519/donna/ed25519_tor.c @@ -40,7 +40,7 @@ #include "ed25519-randombytes.h" #include "ed25519-hash.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" typedef unsigned char ed25519_signature[64]; typedef unsigned char ed25519_public_key[32]; diff --git a/src/ext/ed25519/ref10/blinding.c b/src/ext/ed25519/ref10/blinding.c index 6408491fa..8485524e5 100644 --- a/src/ext/ed25519/ref10/blinding.c +++ b/src/ext/ed25519/ref10/blinding.c @@ -7,7 +7,7 @@ #include "ed25519_ref10.h" #include <string.h> -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" static void ed25519_ref10_gettweak(unsigned char *out, const unsigned char *param) diff --git a/src/ext/ed25519/ref10/crypto_hash_sha512.h b/src/ext/ed25519/ref10/crypto_hash_sha512.h index 8ab0b4565..25e6a90ce 100644 --- a/src/ext/ed25519/ref10/crypto_hash_sha512.h +++ b/src/ext/ed25519/ref10/crypto_hash_sha512.h @@ -1,5 +1,5 @@ /* Added for Tor. */ -#include "common/crypto_digest.h" +#include "lib/crypt_ops/crypto_digest.h" /* Set 'out' to the 512-bit SHA512 hash of the 'len'-byte string in 'inp' */ #define crypto_hash_sha512(out, inp, len) \ diff --git a/src/ext/ed25519/ref10/keypair.c b/src/ext/ed25519/ref10/keypair.c index 8ed0a4a8f..a6e2d4c78 100644 --- a/src/ext/ed25519/ref10/keypair.c +++ b/src/ext/ed25519/ref10/keypair.c @@ -6,8 +6,8 @@ #include "crypto_hash_sha512.h" #include "ge.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" int crypto_sign_seckey(unsigned char *sk) diff --git a/src/ext/ed25519/ref10/randombytes.h b/src/ext/ed25519/ref10/randombytes.h index f5bc3b228..c2cef10ce 100644 --- a/src/ext/ed25519/ref10/randombytes.h +++ b/src/ext/ed25519/ref10/randombytes.h @@ -1,4 +1,4 @@ /* Added for Tor. */ -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #define randombytes(b, n) \ (crypto_strongest_rand((b), (n)), 0) diff --git a/src/ext/keccak-tiny/keccak-tiny-unrolled.c b/src/ext/keccak-tiny/keccak-tiny-unrolled.c index 233a73331..05cf0ec3f 100644 --- a/src/ext/keccak-tiny/keccak-tiny-unrolled.c +++ b/src/ext/keccak-tiny/keccak-tiny-unrolled.c @@ -9,7 +9,7 @@ #include "keccak-tiny.h" #include <string.h> -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "byteorder.h" /******** Endianness conversion helpers ********/ diff --git a/src/lib/crypt_ops/aes.c b/src/lib/crypt_ops/aes.c index 70e48a74f..c421453fd 100644 --- a/src/lib/crypt_ops/aes.c +++ b/src/lib/crypt_ops/aes.c @@ -16,9 +16,9 @@ #include <ws2tcpip.h> #endif -#include "common/compat_openssl.h" +#include "lib/crypt_ops/compat_openssl.h" #include <openssl/opensslv.h> -#include "common/crypto_openssl_mgt.h" +#include "lib/crypt_ops/crypto_openssl_mgt.h" #if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0) #error "We require OpenSSL >= 1.0.0" @@ -36,7 +36,7 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) #include "common/compat.h" -#include "common/aes.h" +#include "lib/crypt_ops/aes.h" #include "common/util.h" #include "common/torlog.h" #include "lib/ctime/di_ops.h" diff --git a/src/lib/crypt_ops/compat_openssl.h b/src/lib/crypt_ops/compat_openssl.h index a94b26492..317c01134 100644 --- a/src/lib/crypt_ops/compat_openssl.h +++ b/src/lib/crypt_ops/compat_openssl.h @@ -8,7 +8,7 @@ #define TOR_COMPAT_OPENSSL_H #include <openssl/opensslv.h> -#include "common/crypto_openssl_mgt.h" +#include "lib/crypt_ops/crypto_openssl_mgt.h" /** * \file compat_openssl.h diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c index 8a8bb2b77..b562578c5 100644 --- a/src/lib/crypt_ops/crypto.c +++ b/src/lib/crypt_ops/crypto.c @@ -23,16 +23,16 @@ #endif /* defined(_WIN32) */ #define CRYPTO_PRIVATE -#include "common/compat_openssl.h" -#include "common/crypto.h" -#include "common/crypto_curve25519.h" -#include "common/crypto_digest.h" -#include "common/crypto_dh.h" -#include "common/crypto_ed25519.h" -#include "common/crypto_format.h" -#include "common/crypto_rand.h" -#include "common/crypto_rsa.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/compat_openssl.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_dh.h" +#include "lib/crypt_ops/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_format.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_rsa.h" +#include "lib/crypt_ops/crypto_util.h" DISABLE_GCC_WARNING(redundant-decls) @@ -64,7 +64,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "common/torlog.h" #include "lib/cc/torint.h" -#include "common/aes.h" +#include "lib/crypt_ops/aes.h" #include "common/util.h" #include "common/container.h" #include "common/compat.h" diff --git a/src/lib/crypt_ops/crypto.h b/src/lib/crypt_ops/crypto.h index 132446809..58afafed8 100644 --- a/src/lib/crypt_ops/crypto.h +++ b/src/lib/crypt_ops/crypto.h @@ -19,7 +19,7 @@ #include "lib/cc/torint.h" #include "common/compat.h" #include "common/util.h" -#include "common/crypto_rsa.h" +#include "lib/crypt_ops/crypto_rsa.h" /** Length of our symmetric cipher's keys of 128-bit. */ #define CIPHER_KEY_LEN 16 diff --git a/src/lib/crypt_ops/crypto_curve25519.c b/src/lib/crypt_ops/crypto_curve25519.c index f28cebb88..8302483d8 100644 --- a/src/lib/crypt_ops/crypto_curve25519.c +++ b/src/lib/crypt_ops/crypto_curve25519.c @@ -21,11 +21,11 @@ #include <sys/stat.h> #endif #include "common/container.h" -#include "common/crypto_curve25519.h" -#include "common/crypto_digest.h" -#include "common/crypto_format.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_format.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "common/util.h" #include "common/torlog.h" diff --git a/src/lib/crypt_ops/crypto_curve25519.h b/src/lib/crypt_ops/crypto_curve25519.h index 8a5b9b201..8a3386611 100644 --- a/src/lib/crypt_ops/crypto_curve25519.h +++ b/src/lib/crypt_ops/crypto_curve25519.h @@ -6,8 +6,8 @@ #include "common/testsupport.h" #include "lib/cc/torint.h" -#include "common/crypto_digest.h" -#include "common/crypto_openssl_mgt.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_openssl_mgt.h" /** Length of a curve25519 public key when encoded. */ #define CURVE25519_PUBKEY_LEN 32 diff --git a/src/lib/crypt_ops/crypto_dh.c b/src/lib/crypt_ops/crypto_dh.c index a9bd348ff..2442dae55 100644 --- a/src/lib/crypt_ops/crypto_dh.c +++ b/src/lib/crypt_ops/crypto_dh.c @@ -9,11 +9,11 @@ * \brief Block of functions related with DH utilities and operations. **/ -#include "common/compat_openssl.h" -#include "common/crypto_dh.h" -#include "common/crypto_digest.h" -#include "common/crypto_hkdf.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/compat_openssl.h" +#include "lib/crypt_ops/crypto_dh.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_hkdf.h" +#include "lib/crypt_ops/crypto_util.h" DISABLE_GCC_WARNING(redundant-decls) diff --git a/src/lib/crypt_ops/crypto_digest.c b/src/lib/crypt_ops/crypto_digest.c index 708fbf9be..44494337c 100644 --- a/src/lib/crypt_ops/crypto_digest.c +++ b/src/lib/crypt_ops/crypto_digest.c @@ -11,9 +11,9 @@ **/ #include "common/container.h" -#include "common/crypto_digest.h" -#include "common/crypto_openssl_mgt.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_openssl_mgt.h" +#include "lib/crypt_ops/crypto_util.h" #include "common/torlog.h" #include "keccak-tiny/keccak-tiny.h" diff --git a/src/lib/crypt_ops/crypto_ed25519.c b/src/lib/crypt_ops/crypto_ed25519.c index b0b954796..ca1030b0a 100644 --- a/src/lib/crypt_ops/crypto_ed25519.c +++ b/src/lib/crypt_ops/crypto_ed25519.c @@ -21,12 +21,12 @@ #include <sys/stat.h> #endif -#include "common/crypto_curve25519.h" -#include "common/crypto_digest.h" -#include "common/crypto_ed25519.h" -#include "common/crypto_format.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_format.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "common/torlog.h" #include "common/util.h" #include "common/util_format.h" diff --git a/src/lib/crypt_ops/crypto_ed25519.h b/src/lib/crypt_ops/crypto_ed25519.h index 981b0dce2..69afb60ab 100644 --- a/src/lib/crypt_ops/crypto_ed25519.h +++ b/src/lib/crypt_ops/crypto_ed25519.h @@ -6,7 +6,7 @@ #include "common/testsupport.h" #include "lib/cc/torint.h" -#include "common/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_curve25519.h" #include "common/util.h" #define ED25519_PUBKEY_LEN 32 diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c index 6245b70cc..07008eff2 100644 --- a/src/lib/crypt_ops/crypto_format.c +++ b/src/lib/crypt_ops/crypto_format.c @@ -15,11 +15,11 @@ #include <sys/stat.h> #endif #include "common/container.h" -#include "common/crypto_curve25519.h" -#include "common/crypto_digest.h" -#include "common/crypto_ed25519.h" -#include "common/crypto_format.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_format.h" +#include "lib/crypt_ops/crypto_util.h" #include "common/util.h" #include "common/util_format.h" #include "common/torlog.h" diff --git a/src/lib/crypt_ops/crypto_format.h b/src/lib/crypt_ops/crypto_format.h index 47f52b94b..e0d9894f1 100644 --- a/src/lib/crypt_ops/crypto_format.h +++ b/src/lib/crypt_ops/crypto_format.h @@ -9,7 +9,7 @@ #include "common/testsupport.h" #include "lib/cc/torint.h" -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" int crypto_write_tagged_contents_to_file(const char *fname, const char *typestring, diff --git a/src/lib/crypt_ops/crypto_hkdf.c b/src/lib/crypt_ops/crypto_hkdf.c index 8dc15b6ff..86ec4367a 100644 --- a/src/lib/crypt_ops/crypto_hkdf.c +++ b/src/lib/crypt_ops/crypto_hkdf.c @@ -9,11 +9,11 @@ * \brief Block of functions related with HKDF utilities and operations. **/ -#include "common/crypto_hkdf.h" -#include "common/crypto_util.h" -#include "common/crypto_digest.h" +#include "lib/crypt_ops/crypto_hkdf.h" +#include "lib/crypt_ops/crypto_util.h" +#include "lib/crypt_ops/crypto_digest.h" -#include "common/crypto_openssl_mgt.h" +#include "lib/crypt_ops/crypto_openssl_mgt.h" #include <openssl/opensslv.h> #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index 8acb9cdf1..b18717a11 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -10,8 +10,8 @@ * \brief Block of functions related to operations from OpenSSL. **/ -#include "common/compat_openssl.h" -#include "common/crypto_openssl_mgt.h" +#include "lib/crypt_ops/compat_openssl.h" +#include "lib/crypt_ops/crypto_openssl_mgt.h" DISABLE_GCC_WARNING(redundant-decls) diff --git a/src/lib/crypt_ops/crypto_pwbox.c b/src/lib/crypt_ops/crypto_pwbox.c index 799a8799e..9a315d42d 100644 --- a/src/lib/crypt_ops/crypto_pwbox.c +++ b/src/lib/crypt_ops/crypto_pwbox.c @@ -8,12 +8,12 @@ * them to disk. */ -#include "common/crypto.h" -#include "common/crypto_digest.h" -#include "common/crypto_pwbox.h" -#include "common/crypto_rand.h" -#include "common/crypto_s2k.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_pwbox.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_s2k.h" +#include "lib/crypt_ops/crypto_util.h" #include "lib/ctime/di_ops.h" #include "common/util.h" #include "trunnel/pwbox.h" diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 6c88e28d8..9fd8c1075 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -14,7 +14,7 @@ #ifndef CRYPTO_RAND_PRIVATE #define CRYPTO_RAND_PRIVATE -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #ifdef _WIN32 #include <windows.h> @@ -23,8 +23,8 @@ #include "common/container.h" #include "common/compat.h" -#include "common/compat_openssl.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/compat_openssl.h" +#include "lib/crypt_ops/crypto_util.h" #include "common/sandbox.h" #include "common/testsupport.h" #include "common/torlog.h" diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 312898343..a20d47132 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -9,14 +9,14 @@ * \brief Block of functions related with RSA utilities and operations. **/ -#include "common/crypto.h" -#include "common/crypto_curve25519.h" -#include "common/crypto_digest.h" -#include "common/crypto_format.h" -#include "common/compat_openssl.h" -#include "common/crypto_rand.h" -#include "common/crypto_rsa.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_format.h" +#include "lib/crypt_ops/compat_openssl.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_rsa.h" +#include "lib/crypt_ops/crypto_util.h" DISABLE_GCC_WARNING(redundant-decls) diff --git a/src/lib/crypt_ops/crypto_rsa.h b/src/lib/crypt_ops/crypto_rsa.h index a80c46bb9..31f7f2484 100644 --- a/src/lib/crypt_ops/crypto_rsa.h +++ b/src/lib/crypt_ops/crypto_rsa.h @@ -15,7 +15,7 @@ #include "orconfig.h" -#include "common/crypto_digest.h" +#include "lib/crypt_ops/crypto_digest.h" #include <stdio.h> #include "lib/cc/torint.h" #include "common/testsupport.h" diff --git a/src/lib/crypt_ops/crypto_s2k.c b/src/lib/crypt_ops/crypto_s2k.c index db57691f6..722407bf4 100644 --- a/src/lib/crypt_ops/crypto_s2k.c +++ b/src/lib/crypt_ops/crypto_s2k.c @@ -13,12 +13,12 @@ #define CRYPTO_S2K_PRIVATE #include "common/compat.h" -#include "common/crypto.h" -#include "common/crypto_digest.h" -#include "common/crypto_hkdf.h" -#include "common/crypto_rand.h" -#include "common/crypto_s2k.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_hkdf.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_s2k.h" +#include "lib/crypt_ops/crypto_util.h" #include "common/util.h" #include <openssl/evp.h> diff --git a/src/lib/crypt_ops/crypto_util.c b/src/lib/crypt_ops/crypto_util.c index 71707d4bf..8ef0690c1 100644 --- a/src/lib/crypt_ops/crypto_util.c +++ b/src/lib/crypt_ops/crypto_util.c @@ -13,7 +13,7 @@ #ifndef CRYPTO_UTIL_PRIVATE #define CRYPTO_UTIL_PRIVATE -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include <string.h> diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index 0a57b9552..5accb2d91 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -8,13 +8,13 @@ #include "orconfig.h" #include <stddef.h> #include "common/buffers.h" -#include "common/buffers_tls.h" +#include "lib/tls/buffers_tls.h" #include "common/compat.h" #include "lib/compress/compress.h" #include "common/util.h" #include "lib/cc/torint.h" #include "common/torlog.h" -#include "common/tortls.h" +#include "lib/tls/tortls.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/tls/tortls.c b/src/lib/tls/tortls.c index 419d9c931..ac45175c7 100644 --- a/src/lib/tls/tortls.c +++ b/src/lib/tls/tortls.c @@ -24,10 +24,10 @@ #include <ws2tcpip.h> #endif -#include "common/crypto.h" -#include "common/crypto_rand.h" -#include "common/crypto_dh.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_dh.h" +#include "lib/crypt_ops/crypto_util.h" #include "common/compat.h" /* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in @@ -52,7 +52,7 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) #define TORTLS_PRIVATE -#include "common/tortls.h" +#include "lib/tls/tortls.h" #include "common/util.h" #include "common/torlog.h" #include "common/container.h" @@ -2660,4 +2660,3 @@ evaluate_ecgroup_for_tls(const char *ecgroup) return ret; } - diff --git a/src/lib/tls/tortls.h b/src/lib/tls/tortls.h index c7b319761..901cae49f 100644 --- a/src/lib/tls/tortls.h +++ b/src/lib/tls/tortls.h @@ -11,8 +11,8 @@ * \brief Headers for tortls.c **/ -#include "common/crypto_rsa.h" -#include "common/compat_openssl.h" +#include "lib/crypt_ops/crypto_rsa.h" +#include "lib/crypt_ops/compat_openssl.h" #include "common/compat.h" #include "common/testsupport.h" diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 9ca232627..a0df5c986 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -21,7 +21,7 @@ #include "or/config.h" #include "or/connection_edge.h" #include "or/control.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/dns.h" #include "or/nodelist.h" #include "or/routerset.h" diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index 190f54f29..2afa483f5 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -16,7 +16,7 @@ #include "or/networkstatus.h" #include "or/connection.h" #include "or/connection_or.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/main.h" #include "or/rephist.h" #include "or/router.h" diff --git a/src/or/circpathbias.c b/src/or/circpathbias.c index ace29c4a0..908b76b48 100644 --- a/src/or/circpathbias.c +++ b/src/or/circpathbias.c @@ -30,7 +30,7 @@ #include "or/circuitstats.h" #include "or/connection_edge.h" #include "or/config.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/entrynodes.h" #include "or/networkstatus.h" #include "or/relay.h" diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index f52708277..28295147c 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -43,7 +43,7 @@ #include "or/connection_edge.h" #include "or/connection_or.h" #include "or/control.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/directory.h" #include "or/entrynodes.h" #include "or/hs_ntor.h" diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 9f64a1a20..a696533ae 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -65,8 +65,8 @@ #include "or/connection_edge.h" #include "or/connection_or.h" #include "or/control.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" #include "or/entrynodes.h" #include "or/main.h" diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c index 3b144e7d9..1ee5f1f62 100644 --- a/src/or/circuitmux_ewma.c +++ b/src/or/circuitmux_ewma.c @@ -37,7 +37,7 @@ #include "or/or.h" #include "or/circuitmux.h" #include "or/circuitmux_ewma.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/networkstatus.h" /*** EWMA parameter #defines ***/ diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index ebd082306..34605457d 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -31,7 +31,7 @@ #include "or/config.h" #include "or/confparse.h" #include "or/control.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/main.h" #include "or/networkstatus.h" #include "or/rendclient.h" diff --git a/src/or/command.c b/src/or/command.c index dd8e7d6f3..387fd49bd 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -46,7 +46,7 @@ #include "or/config.h" #include "or/control.h" #include "or/cpuworker.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/dos.h" #include "or/hibernate.h" #include "or/nodelist.h" diff --git a/src/or/config.c b/src/or/config.c index 37e6a6f92..6bdb4ab7d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -79,8 +79,8 @@ #include "or/control.h" #include "or/confparse.h" #include "or/cpuworker.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/dirserv.h" #include "or/dns.h" #include "or/dos.h" diff --git a/src/or/connection.c b/src/or/connection.c index 450903d6d..e06e9c650 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -58,7 +58,7 @@ #include "or/or.h" #include "or/bridges.h" #include "common/buffers.h" -#include "common/buffers_tls.h" +#include "lib/tls/buffers_tls.h" /* * Define this so we get channel internal functions, since we're implementing * part of a subclass (channel_tls_t). @@ -76,7 +76,7 @@ #include "or/connection_edge.h" #include "or/connection_or.h" #include "or/control.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" #include "or/dirserv.h" #include "or/dns.h" diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 6d6279c83..5bb85255b 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -70,7 +70,7 @@ #include "or/connection_edge.h" #include "or/connection_or.h" #include "or/control.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/dns.h" #include "or/dnsserv.h" #include "or/directory.h" diff --git a/src/or/connection_or.c b/src/or/connection_or.c index aff5f105a..7badcd370 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -39,8 +39,8 @@ #include "or/connection.h" #include "or/connection_or.h" #include "or/control.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/dirserv.h" #include "or/entrynodes.h" #include "or/geoip.h" diff --git a/src/or/conscache.c b/src/or/conscache.c index 5bfd78a78..63ff0db78 100644 --- a/src/or/conscache.c +++ b/src/or/conscache.c @@ -5,7 +5,7 @@ #include "or/config.h" #include "or/conscache.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "common/storagedir.h" #define CCE_MAGIC 0x17162253 diff --git a/src/or/control.c b/src/or/control.c index 0460463d7..13814804a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -53,8 +53,8 @@ #include "or/connection_edge.h" #include "or/connection_or.h" #include "or/control.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" #include "or/dirserv.h" #include "or/dnsserv.h" @@ -104,7 +104,7 @@ #include <sys/resource.h> #endif -#include "common/crypto_s2k.h" +#include "lib/crypt_ops/crypto_s2k.h" #include "common/procmon.h" /** Yield true iff s is the state of a control_connection_t that has diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 18b8adab8..24a75b16d 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -24,8 +24,8 @@ #include "or/connection_or.h" #include "or/config.h" #include "or/cpuworker.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/main.h" #include "or/onion.h" #include "or/rephist.h" diff --git a/src/or/dirauth/shared_random.c b/src/or/dirauth/shared_random.c index 0860efaca..8b53c1e74 100644 --- a/src/or/dirauth/shared_random.c +++ b/src/or/dirauth/shared_random.c @@ -91,8 +91,8 @@ #include "or/dirauth/shared_random.h" #include "or/config.h" #include "or/confparse.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/networkstatus.h" #include "or/router.h" #include "or/routerkeys.h" diff --git a/src/or/dirauth/shared_random_state.c b/src/or/dirauth/shared_random_state.c index 9bea02e82..f77a64dfc 100644 --- a/src/or/dirauth/shared_random_state.c +++ b/src/or/dirauth/shared_random_state.c @@ -13,7 +13,7 @@ #include "or/or.h" #include "or/config.h" #include "or/confparse.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/dirauth/dirvote.h" #include "or/networkstatus.h" #include "or/router.h" diff --git a/src/or/directory.c b/src/or/directory.c index 9918433f5..2d3f7fe9a 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -18,8 +18,8 @@ #include "or/consdiffmgr.h" #include "or/control.h" #include "common/compat.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" #include "or/dirserv.h" #include "or/entrynodes.h" diff --git a/src/or/dns.c b/src/or/dns.c index 3f5d39b41..8d809d8c3 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -56,7 +56,7 @@ #include "or/connection.h" #include "or/connection_edge.h" #include "or/control.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/dns.h" #include "or/main.h" #include "or/policies.h" diff --git a/src/or/dos.c b/src/or/dos.c index 5f4142b0e..02bdbcf35 100644 --- a/src/or/dos.c +++ b/src/or/dos.c @@ -12,7 +12,7 @@ #include "or/channel.h" #include "or/config.h" #include "or/connection_or.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/geoip.h" #include "or/main.h" #include "or/networkstatus.h" diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 6d13efda9..1fb621590 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -124,7 +124,7 @@ #include "or/confparse.h" #include "or/connection.h" #include "or/control.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/directory.h" #include "or/entrynodes.h" #include "or/main.h" diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c index d84f263aa..701dc4528 100644 --- a/src/or/ext_orport.c +++ b/src/or/ext_orport.c @@ -22,8 +22,8 @@ #include "or/connection_or.h" #include "or/control.h" #include "or/config.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/ext_orport.h" #include "or/main.h" #include "or/proto_ext_or.h" diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 595b83957..12264f758 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -36,7 +36,7 @@ hibernating, phase 2: #include "or/connection_edge.h" #include "or/connection_or.h" #include "or/control.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/hibernate.h" #include "or/main.h" #include "or/router.h" diff --git a/src/or/hs_cache.c b/src/or/hs_cache.c index c16a42a48..a42fe6b1a 100644 --- a/src/or/hs_cache.c +++ b/src/or/hs_cache.c @@ -11,7 +11,7 @@ #include "or/or.h" #include "or/config.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/hs_ident.h" #include "or/hs_common.h" #include "or/hs_client.h" diff --git a/src/or/hs_cache.h b/src/or/hs_cache.h index 5ca158781..78ed81b6e 100644 --- a/src/or/hs_cache.h +++ b/src/or/hs_cache.h @@ -11,7 +11,7 @@ #include <stdint.h> -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #include "or/hs_common.h" #include "or/hs_descriptor.h" #include "or/rendcommon.h" diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c index 40ec4ba9e..b50c87dfa 100644 --- a/src/or/hs_cell.c +++ b/src/or/hs_cell.c @@ -8,7 +8,7 @@ #include "or/or.h" #include "or/config.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/rendservice.h" #include "or/replaycache.h" #include "common/util.h" diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index 36a982044..9fcb30ecc 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -13,8 +13,8 @@ #include "or/circuitlist.h" #include "or/circuituse.h" #include "or/config.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/nodelist.h" #include "or/policies.h" #include "or/relay.h" diff --git a/src/or/hs_circuit.h b/src/or/hs_circuit.h index fbf11d1cc..425070f4c 100644 --- a/src/or/hs_circuit.h +++ b/src/or/hs_circuit.h @@ -10,7 +10,7 @@ #define TOR_HS_CIRCUIT_H #include "or/or.h" -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #include "or/hs_service.h" diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 331793c1f..90a3fb3dc 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -17,8 +17,8 @@ #include "or/connection.h" #include "or/connection_edge.h" #include "common/container.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" #include "or/hs_cache.h" #include "or/hs_cell.h" diff --git a/src/or/hs_client.h b/src/or/hs_client.h index f7fca0b00..808391074 100644 --- a/src/or/hs_client.h +++ b/src/or/hs_client.h @@ -9,7 +9,7 @@ #ifndef TOR_HS_CLIENT_H #define TOR_HS_CLIENT_H -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #include "or/hs_descriptor.h" #include "or/hs_ident.h" diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 51d74bf5a..e88a04620 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -15,8 +15,8 @@ #include "or/config.h" #include "or/circuitbuild.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/networkstatus.h" #include "or/nodelist.h" #include "or/hs_cache.h" diff --git a/src/or/hs_control.c b/src/or/hs_control.c index fc828d072..76c40918b 100644 --- a/src/or/hs_control.c +++ b/src/or/hs_control.c @@ -8,7 +8,7 @@ #include "or/or.h" #include "or/control.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/hs_common.h" #include "or/hs_control.h" #include "or/hs_descriptor.h" diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index feec0e66d..db88cdc4a 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -59,8 +59,8 @@ #include "trunnel/ed25519_cert.h" /* Trunnel interface. */ #include "or/hs_descriptor.h" #include "or/circuitbuild.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/parsecommon.h" #include "or/rendcache.h" #include "or/hs_cache.h" diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index 8a2df9527..5478edc89 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -14,8 +14,8 @@ #include "or/or.h" #include "common/address.h" #include "common/container.h" -#include "common/crypto.h" -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_ed25519.h" #include "trunnel/ed25519_cert.h" /* needed for trunnel */ #include "or/torcert.h" diff --git a/src/or/hs_ident.c b/src/or/hs_ident.c index d3d11393f..20539ca87 100644 --- a/src/or/hs_ident.c +++ b/src/or/hs_ident.c @@ -7,7 +7,7 @@ * subsytem. **/ -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/hs_ident.h" /* Return a newly allocated circuit identifier. The given public key is copied diff --git a/src/or/hs_ident.h b/src/or/hs_ident.h index 476cdc19e..8c53b9dbe 100644 --- a/src/or/hs_ident.h +++ b/src/or/hs_ident.h @@ -21,7 +21,7 @@ #ifndef TOR_HS_IDENT_H #define TOR_HS_IDENT_H -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #include "or/hs_common.h" diff --git a/src/or/hs_intropoint.h b/src/or/hs_intropoint.h index 77e41647b..5f8292099 100644 --- a/src/or/hs_intropoint.h +++ b/src/or/hs_intropoint.h @@ -9,7 +9,7 @@ #ifndef TOR_HS_INTRO_H #define TOR_HS_INTRO_H -#include "common/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_curve25519.h" #include "or/torcert.h" /* Authentication key type in an ESTABLISH_INTRO cell. */ diff --git a/src/or/hs_ntor.c b/src/or/hs_ntor.c index 61e1474aa..a8a76ed54 100644 --- a/src/or/hs_ntor.c +++ b/src/or/hs_ntor.c @@ -25,7 +25,7 @@ */ #include "or/or.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/hs_ntor.h" /* String constants used by the ntor HS protocol */ diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 722cc7fc5..b5649e263 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -15,8 +15,8 @@ #include "or/circuituse.h" #include "or/config.h" #include "or/connection.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" #include "or/main.h" #include "or/networkstatus.h" diff --git a/src/or/hs_service.h b/src/or/hs_service.h index 32db63bd2..4676042b5 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -9,8 +9,8 @@ #ifndef TOR_HS_SERVICE_H #define TOR_HS_SERVICE_H -#include "common/crypto_curve25519.h" -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #include "or/replaycache.h" #include "or/hs_common.h" diff --git a/src/or/keypin.c b/src/or/keypin.c index 17b5010fa..1bdb471b3 100644 --- a/src/or/keypin.c +++ b/src/or/keypin.c @@ -12,8 +12,8 @@ #include "orconfig.h" #include "common/compat.h" -#include "common/crypto_digest.h" -#include "common/crypto_format.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_format.h" #include "lib/ctime/di_ops.h" #include "ht.h" #include "or/keypin.h" diff --git a/src/or/main.c b/src/or/main.c index 35d6d62bb..c690fdd90 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -52,7 +52,7 @@ #include "lib/err/backtrace.h" #include "or/bridges.h" #include "common/buffers.h" -#include "common/buffers_tls.h" +#include "lib/tls/buffers_tls.h" #include "or/channel.h" #include "or/channeltls.h" #include "or/channelpadding.h" @@ -70,8 +70,8 @@ #include "or/consdiffmgr.h" #include "or/control.h" #include "or/cpuworker.h" -#include "common/crypto_s2k.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_s2k.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/directory.h" #include "or/dirserv.h" #include "or/dns.h" diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 649d146d4..e6eaffffa 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -48,8 +48,8 @@ #include "or/connection_or.h" #include "or/consdiffmgr.h" #include "or/control.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" #include "or/dirserv.h" #include "or/dos.h" diff --git a/src/or/onion.c b/src/or/onion.c index 27e05c7cc..776aacbf7 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -67,7 +67,7 @@ #include "or/circuitlist.h" #include "or/config.h" #include "or/cpuworker.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/networkstatus.h" #include "or/onion.h" #include "or/onion_fast.h" diff --git a/src/or/onion_fast.c b/src/or/onion_fast.c index 7d92de038..7d555c26e 100644 --- a/src/or/onion_fast.c +++ b/src/or/onion_fast.c @@ -29,8 +29,8 @@ #include "or/or.h" #include "or/onion_fast.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" /** Release all state held in victim. */ void diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c index d44933a2b..a6685eb99 100644 --- a/src/or/onion_ntor.c +++ b/src/or/onion_ntor.c @@ -21,10 +21,10 @@ #include "orconfig.h" #define ONION_NTOR_PRIVATE -#include "common/crypto.h" -#include "common/crypto_hkdf.h" -#include "common/crypto_digest.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_hkdf.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/onion_ntor.h" #include "common/torlog.h" #include "common/util.h" diff --git a/src/or/onion_ntor.h b/src/or/onion_ntor.h index 0dd66f1e8..b4da3a8d7 100644 --- a/src/or/onion_ntor.h +++ b/src/or/onion_ntor.h @@ -5,7 +5,7 @@ #define TOR_ONION_NTOR_H #include "lib/cc/torint.h" -#include "common/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_curve25519.h" #include "lib/ctime/di_ops.h" /** State to be maintained by a client between sending an ntor onionskin diff --git a/src/or/onion_tap.c b/src/or/onion_tap.c index 0f9fe31be..cf5963b19 100644 --- a/src/or/onion_tap.c +++ b/src/or/onion_tap.c @@ -29,8 +29,8 @@ #include "or/or.h" #include "or/config.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/onion_tap.h" #include "or/rephist.h" diff --git a/src/or/or.h b/src/or/or.h index 53dc89607..cb7e84e68 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -63,11 +63,11 @@ #include <windows.h> #endif /* defined(_WIN32) */ -#include "common/crypto.h" -#include "common/crypto_format.h" -#include "common/crypto_dh.h" -#include "common/crypto_hkdf.h" -#include "common/tortls.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_format.h" +#include "lib/crypt_ops/crypto_dh.h" +#include "lib/crypt_ops/crypto_hkdf.h" +#include "lib/tls/tortls.h" #include "common/torlog.h" #include "common/container.h" #include "lib/compress/compress.h" @@ -76,8 +76,8 @@ #include "ht.h" #include "common/confline.h" #include "or/replaycache.h" -#include "common/crypto_curve25519.h" -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #include "tor_queue.h" #include "common/token_bucket.h" #include "common/util_format.h" diff --git a/src/or/parsecommon.h b/src/or/parsecommon.h index bfd5c58b8..93e62a559 100644 --- a/src/or/parsecommon.h +++ b/src/or/parsecommon.h @@ -10,7 +10,7 @@ #define TOR_PARSECOMMON_H #include "common/container.h" -#include "common/crypto.h" +#include "lib/crypt_ops/crypto.h" #include "common/memarea.h" /** Enumeration of possible token types. The ones starting with K_ correspond diff --git a/src/or/proto_socks.c b/src/or/proto_socks.c index d113bc9ca..46439d66b 100644 --- a/src/or/proto_socks.c +++ b/src/or/proto_socks.c @@ -9,7 +9,7 @@ #include "common/buffers.h" #include "or/control.h" #include "or/config.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/ext_orport.h" #include "or/proto_socks.h" #include "or/reasons.h" diff --git a/src/or/relay.c b/src/or/relay.c index 230d14130..c81e4af30 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -61,8 +61,8 @@ #include "or/connection_edge.h" #include "or/connection_or.h" #include "or/control.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" #include "or/geoip.h" #include "or/hs_cache.h" diff --git a/src/or/relay_crypto.c b/src/or/relay_crypto.c index 5179984e7..6682cd86f 100644 --- a/src/or/relay_crypto.c +++ b/src/or/relay_crypto.c @@ -7,7 +7,7 @@ #include "or/or.h" #include "or/circuitlist.h" #include "or/config.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/hs_ntor.h" // for HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN #include "or/relay.h" #include "or/relay_crypto.h" diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 6fde0ba26..1da695706 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -16,8 +16,8 @@ #include "or/connection.h" #include "or/connection_edge.h" #include "or/control.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" #include "or/hs_circuit.h" #include "or/hs_client.h" diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 2c1caa6ce..1eadbd602 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -16,8 +16,8 @@ #include "or/circuituse.h" #include "or/config.h" #include "or/control.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/hs_client.h" #include "or/hs_common.h" #include "or/hs_intropoint.h" diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 77a534712..56b65079a 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -12,7 +12,7 @@ #include "or/circuitlist.h" #include "or/circuituse.h" #include "or/config.h" -#include "common/crypto.h" +#include "lib/crypt_ops/crypto.h" #include "or/dos.h" #include "or/relay.h" #include "or/rendmid.h" diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 21a5a4e03..b2023c72c 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -16,8 +16,8 @@ #include "or/circuituse.h" #include "or/config.h" #include "or/control.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" #include "or/hs_common.h" #include "or/hs_config.h" diff --git a/src/or/rephist.c b/src/or/rephist.c index c7a0a2556..a1cfc4932 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -78,7 +78,7 @@ #include "or/circuitlist.h" #include "or/circuituse.h" #include "or/config.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/networkstatus.h" #include "or/nodelist.h" #include "or/rephist.h" diff --git a/src/or/router.c b/src/or/router.c index 4f162ceac..f13788d66 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -13,9 +13,9 @@ #include "or/config.h" #include "or/connection.h" #include "or/control.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" -#include "common/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" +#include "lib/crypt_ops/crypto_curve25519.h" #include "or/directory.h" #include "or/dirserv.h" #include "or/dns.h" diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 6bf066fbb..9f4def0e6 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -16,9 +16,9 @@ #include "or/or.h" #include "or/config.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/router.h" -#include "common/crypto_pwbox.h" +#include "lib/crypt_ops/crypto_pwbox.h" #include "or/routerkeys.h" #include "or/torcert.h" diff --git a/src/or/routerkeys.h b/src/or/routerkeys.h index 2339495d4..a6f06f6e2 100644 --- a/src/or/routerkeys.h +++ b/src/or/routerkeys.h @@ -4,7 +4,7 @@ #ifndef TOR_ROUTERKEYS_H #define TOR_ROUTERKEYS_H -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #define INIT_ED_KEY_CREATE (1u<<0) #define INIT_ED_KEY_REPLACE (1u<<1) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 9a6cf8c25..97b3270f5 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -94,12 +94,12 @@ #include "or/or.h" #include "lib/err/backtrace.h" #include "or/bridges.h" -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #include "or/circuitstats.h" #include "or/config.h" #include "or/connection.h" #include "or/control.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/directory.h" #include "or/dirserv.h" #include "or/entrynodes.h" diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 48b182817..a0426b96c 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -58,7 +58,7 @@ #include "or/or.h" #include "or/circuitstats.h" #include "or/config.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/dirauth/shared_random.h" #include "or/dirserv.h" #include "or/entrynodes.h" diff --git a/src/or/torcert.c b/src/or/torcert.c index a6bbe4231..23dfd3d43 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -27,7 +27,7 @@ #include "or/or.h" #include "or/config.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "or/torcert.h" #include "trunnel/ed25519_cert.h" #include "common/torlog.h" diff --git a/src/or/torcert.h b/src/or/torcert.h index cba3d3622..ba5787934 100644 --- a/src/or/torcert.h +++ b/src/or/torcert.h @@ -4,7 +4,7 @@ #ifndef TORCERT_H_INCLUDED #define TORCERT_H_INCLUDED -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #define SIGNED_KEY_TYPE_ED25519 0x01 diff --git a/src/test/bench.c b/src/test/bench.c index f54d8f5c6..49ac7269e 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -20,10 +20,10 @@ #include <openssl/obj_mac.h> #include "or/config.h" -#include "common/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_curve25519.h" #include "or/onion_ntor.h" -#include "common/crypto_ed25519.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/consdiff.h" #include "or/cell_st.h" diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index d1ef34b6b..ada9fa6c2 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -6,7 +6,7 @@ #include "or/or.h" #include "trunnel/ed25519_cert.h" /* Trunnel interface. */ -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #include "or/hs_descriptor.h" #include "or/routerparse.h" #include "common/util.h" diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index 12ebd97bd..9e736ea69 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -6,8 +6,8 @@ #include "lib/err/backtrace.h" #include "or/config.h" #include "test/fuzz/fuzzing.h" -#include "common/crypto.h" -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_ed25519.h" static or_options_t *mock_options = NULL; static const or_options_t * diff --git a/src/test/hs_test_helpers.c b/src/test/hs_test_helpers.c index ea12970b9..d238bf8e5 100644 --- a/src/test/hs_test_helpers.c +++ b/src/test/hs_test_helpers.c @@ -2,7 +2,7 @@ /* See LICENSE for licensing information */ #include "or/or.h" -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #include "test/test.h" #include "or/torcert.h" diff --git a/src/test/rend_test_helpers.c b/src/test/rend_test_helpers.c index 6f0c1c121..31af58c27 100644 --- a/src/test/rend_test_helpers.c +++ b/src/test/rend_test_helpers.c @@ -2,7 +2,7 @@ /* See LICENSE for licensing information */ #include "or/or.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "test/test.h" #include "or/rendcommon.h" #include "test/rend_test_helpers.h" diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index a8326aa67..16bb017c8 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -7,7 +7,7 @@ #include <sys/types.h> #include <stdlib.h> -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #include "common/compat.h" #include "common/util.h" diff --git a/src/test/test-timers.c b/src/test/test-timers.c index 1953ea5e3..70f07fba4 100644 --- a/src/test/test-timers.c +++ b/src/test/test-timers.c @@ -9,7 +9,7 @@ #include "common/compat.h" #include "common/compat_libevent.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "common/timers.h" #include "common/util.h" diff --git a/src/test/test.c b/src/test/test.c index 2f9b75ac8..1a3f4f8eb 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -9,7 +9,7 @@ **/ #include "orconfig.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include <stdio.h> #ifdef HAVE_FCNTL_H @@ -60,7 +60,7 @@ double fabs(double x); #include "or/rephist.h" #include "or/routerparse.h" #include "or/statefile.h" -#include "common/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_curve25519.h" #include "or/extend_info_st.h" #include "or/or_circuit_st.h" diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 6778fde97..0a3212adb 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -6,7 +6,7 @@ #define ADDRESSMAP_PRIVATE #include "orconfig.h" #include "or/or.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "test/test.h" #include "or/addressmap.h" #include "test/log_test_helpers.h" diff --git a/src/test/test_address_set.c b/src/test/test_address_set.c index 1df7b3442..369968584 100644 --- a/src/test/test_address_set.c +++ b/src/test/test_address_set.c @@ -2,7 +2,7 @@ /* See LICENSE for licensing information */ #include "or/or.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "common/address_set.h" #include "or/microdesc.h" #include "or/networkstatus.h" diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index cd4c9d0ae..080325538 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -7,8 +7,8 @@ #define PROTO_HTTP_PRIVATE #include "or/or.h" #include "common/buffers.h" -#include "common/buffers_tls.h" -#include "common/crypto_rand.h" +#include "lib/tls/buffers_tls.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/proto_http.h" #include "or/proto_socks.h" #include "test/test.h" diff --git a/src/test/test_cell_formats.c b/src/test/test_cell_formats.c index 685b6efc3..844fa4a16 100644 --- a/src/test/test_cell_formats.c +++ b/src/test/test_cell_formats.c @@ -12,7 +12,7 @@ #include "or/connection_edge.h" #include "or/connection_or.h" #include "or/config.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/onion.h" #include "or/onion_tap.h" #include "or/onion_fast.h" diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 5b30c7112..d236580fb 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -12,7 +12,7 @@ #include "or/circuitmux_ewma.h" /* For var_cell_free */ #include "or/connection_or.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" /* For packed_cell stuff */ #define RELAY_PRIVATE #include "or/relay.h" diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c index 08fec2de2..58bfaff68 100644 --- a/src/test/test_channeltls.c +++ b/src/test/test_channeltls.c @@ -15,7 +15,7 @@ #include "or/config.h" /* For init/free stuff */ #include "or/scheduler.h" -#include "common/tortls.h" +#include "lib/tls/tortls.h" #include "or/or_connection_st.h" diff --git a/src/test/test_consdiffmgr.c b/src/test/test_consdiffmgr.c index c4b89ddf0..c09586afc 100644 --- a/src/test/test_consdiffmgr.c +++ b/src/test/test_consdiffmgr.c @@ -9,7 +9,7 @@ #include "or/consdiff.h" #include "or/consdiffmgr.h" #include "or/cpuworker.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/networkstatus.h" #include "or/routerparse.h" #include "common/workqueue.h" diff --git a/src/test/test_containers.c b/src/test/test_containers.c index 1d5ee4fc9..efc6a181f 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -5,7 +5,7 @@ #include "orconfig.h" #include "or/or.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/fp_pair.h" #include "test/test.h" diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index c580a1945..e8a2efe59 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -8,12 +8,12 @@ #define CRYPTO_RAND_PRIVATE #include "or/or.h" #include "test/test.h" -#include "common/aes.h" +#include "lib/crypt_ops/aes.h" #include "common/util.h" #include "siphash.h" -#include "common/crypto_curve25519.h" -#include "common/crypto_ed25519.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_rand.h" #include "ed25519_vectors.inc" /** Run unit tests for Diffie-Hellman functionality. */ diff --git a/src/test/test_crypto_openssl.c b/src/test/test_crypto_openssl.c index f33ed58d4..cc817ad70 100644 --- a/src/test/test_crypto_openssl.c +++ b/src/test/test_crypto_openssl.c @@ -7,7 +7,7 @@ #define CRYPTO_RAND_PRIVATE -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "common/util.h" #include "common/util_format.h" #include "common/compat.h" @@ -15,7 +15,7 @@ #include <openssl/evp.h> #include <openssl/rand.h> -#include "common/compat_openssl.h" +#include "lib/crypt_ops/compat_openssl.h" /* Test for rectifying openssl RAND engine. */ static void diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c index c15d8deb9..9878a0d02 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -7,9 +7,9 @@ #define CRYPTO_S2K_PRIVATE #include "or/or.h" #include "test/test.h" -#include "common/crypto_s2k.h" -#include "common/crypto_pwbox.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_s2k.h" +#include "lib/crypt_ops/crypto_pwbox.h" +#include "lib/crypt_ops/crypto_rand.h" #if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT) #define HAVE_LIBSCRYPT diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 56293b578..9578ba1d3 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -22,8 +22,8 @@ #include "or/confparse.h" #include "or/config.h" #include "or/control.h" -#include "common/crypto_ed25519.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/directory.h" #include "or/dirserv.h" #include "or/dirauth/dirvote.h" diff --git a/src/test/test_dos.c b/src/test/test_dos.c index 7a2a87d32..4ba24292c 100644 --- a/src/test/test_dos.c +++ b/src/test/test_dos.c @@ -8,7 +8,7 @@ #include "or/or.h" #include "or/dos.h" #include "or/circuitlist.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/geoip.h" #include "or/channel.h" #include "or/microdesc.h" diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 2af9c4a37..2391e10cd 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -18,7 +18,7 @@ #include "or/circuitbuild.h" #include "or/config.h" #include "or/confparse.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/directory.h" #include "or/entrynodes.h" #include "or/nodelist.h" diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index 64ecd422f..3e99961ce 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -10,7 +10,7 @@ #include "or/connection_or.h" #include "or/config.h" #include "or/control.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/ext_orport.h" #include "or/main.h" diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index f346c15ca..2b1c33aa6 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -18,7 +18,7 @@ #include "or/config.h" #include "or/confparse.h" #include "or/connection.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/main.h" #include "or/nodelist.h" #include "or/relay.h" diff --git a/src/test/test_hs_cell.c b/src/test/test_hs_cell.c index f9d25ca09..4bb3c3f77 100644 --- a/src/test/test_hs_cell.c +++ b/src/test/test_hs_cell.c @@ -13,8 +13,8 @@ #include "test/test_helpers.h" #include "test/log_test_helpers.h" -#include "common/crypto_ed25519.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/hs_cell.h" #include "or/hs_intropoint.h" #include "or/hs_service.h" diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c index ebe75d5aa..58002d629 100644 --- a/src/test/test_hs_client.c +++ b/src/test/test_hs_client.c @@ -21,7 +21,7 @@ #include "test/hs_test_helpers.h" #include "or/config.h" -#include "common/crypto.h" +#include "lib/crypt_ops/crypto.h" #include "or/channeltls.h" #include "or/main.h" #include "or/nodelist.h" diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 1822d6c21..6296a709d 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -17,7 +17,7 @@ #include "test/hs_test_helpers.h" #include "or/connection_edge.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/hs_common.h" #include "or/hs_client.h" #include "or/hs_service.h" diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 00b25f142..5cc0e99c6 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -8,9 +8,9 @@ #define HS_DESCRIPTOR_PRIVATE -#include "common/crypto_ed25519.h" -#include "common/crypto_digest.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_rand.h" #include "trunnel/ed25519_cert.h" #include "or/or.h" #include "or/hs_descriptor.h" diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 34e51cba6..843f39423 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -13,7 +13,7 @@ #include "test/test.h" #include "test/log_test_helpers.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/or.h" #include "or/circuitlist.h" diff --git a/src/test/test_hs_ntor_cl.c b/src/test/test_hs_ntor_cl.c index 8c1987772..9b59f0ddb 100644 --- a/src/test/test_hs_ntor_cl.c +++ b/src/test/test_hs_ntor_cl.c @@ -16,8 +16,8 @@ #include "or/or.h" #include "common/util.h" #include "common/compat.h" -#include "common/crypto.h" -#include "common/crypto_curve25519.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_curve25519.h" #include "or/hs_ntor.h" #include "or/onion_ntor.h" diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index bcf72b454..684ac98f4 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -33,7 +33,7 @@ #include "or/circuitbuild.h" #include "or/circuitlist.h" #include "or/circuituse.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/dirauth/dirvote.h" #include "or/networkstatus.h" #include "or/nodelist.h" diff --git a/src/test/test_introduce.c b/src/test/test_introduce.c index 6ffb22fca..f62c7f880 100644 --- a/src/test/test_introduce.c +++ b/src/test/test_introduce.c @@ -2,7 +2,7 @@ /* See LICENSE for licensing information */ #include "orconfig.h" -#include "common/crypto.h" +#include "lib/crypt_ops/crypto.h" #include "or/or.h" #include "test/test.h" diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index 0e5ad7bba..1dc8bc2d2 100644 --- a/src/test/test_nodelist.c +++ b/src/test/test_nodelist.c @@ -7,7 +7,7 @@ **/ #include "or/or.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/networkstatus.h" #include "or/nodelist.h" #include "or/torcert.h" diff --git a/src/test/test_ntor_cl.c b/src/test/test_ntor_cl.c index dbc607db3..a10cd7e9b 100644 --- a/src/test/test_ntor_cl.c +++ b/src/test/test_ntor_cl.c @@ -9,8 +9,8 @@ #include "or/or.h" #include "common/util.h" #include "common/compat.h" -#include "common/crypto.h" -#include "common/crypto_curve25519.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_curve25519.h" #include "or/onion_ntor.h" #define N_ARGS(n) STMT_BEGIN { \ diff --git a/src/test/test_oom.c b/src/test/test_oom.c index 0edc22c50..c78ec4099 100644 --- a/src/test/test_oom.c +++ b/src/test/test_oom.c @@ -13,7 +13,7 @@ #include "common/compat_libevent.h" #include "or/connection.h" #include "or/config.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/relay.h" #include "test/test.h" #include "test/test_helpers.h" diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 64b066429..9f314b770 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -9,7 +9,7 @@ #include "or/main.h" #include "or/config.h" #include "or/connection.h" -#include "common/crypto.h" +#include "lib/crypt_ops/crypto.h" #include "or/circuitbuild.h" #include "or/circuitlist.h" #include "or/connection_edge.h" diff --git a/src/test/test_relaycrypt.c b/src/test/test_relaycrypt.c index 0b8541974..7f0ca0698 100644 --- a/src/test/test_relaycrypt.c +++ b/src/test/test_relaycrypt.c @@ -7,7 +7,7 @@ #include "or/circuitbuild.h" #define CIRCUITLIST_PRIVATE #include "or/circuitlist.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/relay.h" #include "or/relay_crypto.h" diff --git a/src/test/test_router.c b/src/test/test_router.c index f2f325785..6e9424a3a 100644 --- a/src/test/test_router.c +++ b/src/test/test_router.c @@ -9,8 +9,8 @@ #include "or/or.h" #include "or/config.h" -#include "common/crypto_curve25519.h" -#include "common/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_ed25519.h" #include "or/router.h" #include "or/routerlist.h" diff --git a/src/test/test_routerkeys.c b/src/test/test_routerkeys.c index 8cfc9f808..948cf0d60 100644 --- a/src/test/test_routerkeys.c +++ b/src/test/test_routerkeys.c @@ -10,7 +10,7 @@ #include "or/router.h" #include "or/routerkeys.h" #include "common/util.h" -#include "common/crypto.h" +#include "lib/crypt_ops/crypto.h" #include "or/torcert.h" #include "test/test.h" diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index b6032ed87..e8f847833 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -18,7 +18,7 @@ #include "or/connection.h" #include "common/container.h" #include "or/control.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/directory.h" #include "or/dirauth/dirvote.h" #include "or/entrynodes.h" diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 149129d0c..55910a351 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -9,7 +9,7 @@ #include "or/or.h" #include "test/test.h" #include "or/config.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/dirauth/dirvote.h" #include "or/dirauth/shared_random.h" #include "or/dirauth/shared_random_state.h" diff --git a/src/test/test_storagedir.c b/src/test/test_storagedir.c index 4deb88133..4dd767352 100644 --- a/src/test/test_storagedir.c +++ b/src/test/test_storagedir.c @@ -2,7 +2,7 @@ /* See LICENSE for licensing information */ #include "or/or.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "common/storagedir.h" #include "test/test.h" diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 6c6314942..80f95b6c0 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -33,7 +33,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "or/or.h" #include "common/torlog.h" #include "or/config.h" -#include "common/tortls.h" +#include "lib/tls/tortls.h" #include "test/test.h" #include "test/log_test_helpers.h" diff --git a/src/test/test_util.c b/src/test/test_util.c index 4e0fccdff..a766f8457 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -12,7 +12,7 @@ #include "common/buffers.h" #include "or/config.h" #include "or/control.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "test/test.h" #include "common/memarea.h" #include "common/util_process.h" diff --git a/src/test/test_util_format.c b/src/test/test_util_format.c index d56915822..931a184e7 100644 --- a/src/test/test_util_format.c +++ b/src/test/test_util_format.c @@ -6,7 +6,7 @@ #include "test/test.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #define UTIL_FORMAT_PRIVATE #include "common/util_format.h" diff --git a/src/test/test_util_slow.c b/src/test/test_util_slow.c index 3d725d502..9e4d7b0a1 100644 --- a/src/test/test_util_slow.c +++ b/src/test/test_util_slow.c @@ -7,7 +7,7 @@ #define UTIL_PRIVATE #include "common/util.h" #include "common/util_process.h" -#include "common/crypto.h" +#include "lib/crypt_ops/crypto.h" #include "common/torlog.h" #include "test/test.h" diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index 6935d286c..fe23c5319 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -7,8 +7,8 @@ #include "common/compat_threads.h" #include "or/onion.h" #include "common/workqueue.h" -#include "common/crypto_curve25519.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_curve25519.h" +#include "lib/crypt_ops/crypto_rand.h" #include "common/compat_libevent.h" #include <stdio.h> diff --git a/src/test/testing_common.c b/src/test/testing_common.c index f9e60001d..3baeb9803 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -13,7 +13,7 @@ #include "or/or.h" #include "or/control.h" #include "or/config.h" -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "or/rephist.h" #include "lib/err/backtrace.h" #include "test/test.h" diff --git a/src/test/testing_rsakeys.c b/src/test/testing_rsakeys.c index f45fcb11a..087a14e64 100644 --- a/src/test/testing_rsakeys.c +++ b/src/test/testing_rsakeys.c @@ -3,7 +3,7 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "common/crypto_rand.h" +#include "lib/crypt_ops/crypto_rand.h" #include "orconfig.h" #include "or/or.h" #include "test/test.h" diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index 07db3624b..c2a2e0151 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -37,10 +37,10 @@ ENABLE_GCC_WARNING(redundant-decls) #include "common/util.h" #include "common/torlog.h" -#include "common/crypto.h" -#include "common/crypto_digest.h" -#include "common/crypto_rand.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "common/address.h" #include "common/util_format.h"

1 0

[tor/master] Additional non-automated change to trunnel-local.h
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 71571e34283d071b15fce62bce49f0a268f53cd6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 12:47:48 2018 -0400 Additional non-automated change to trunnel-local.h --- src/trunnel/trunnel-local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h index f25659bf6..df852acb1 100644 --- a/src/trunnel/trunnel-local.h +++ b/src/trunnel/trunnel-local.h @@ -4,7 +4,7 @@ #include "common/util.h" #include "common/compat.h" -#include "common/crypto_util.h" +#include "lib/crypt_ops/crypto_util.h" #define trunnel_malloc tor_malloc #define trunnel_calloc tor_calloc

1 0

[tor/master] Split crypto and tls libraries into directories
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 25ccfff86a5b29c9c1ec9b3d01fe1dc796e9afa0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 12:46:11 2018 -0400 Split crypto and tls libraries into directories I am calling the crypto library "crypt_ops", since I want higher-level crypto things to be separated from lower-level ones. This library will hold only the low-level ones, once we have it refactored. --- .gitignore | 7 ++-- Makefile.am | 6 ++- src/common/include.am | 43 --------------------- src/include.am | 2 + src/{common => lib/crypt_ops}/aes.c | 0 src/{common => lib/crypt_ops}/aes.h | 0 src/{common => lib/crypt_ops}/compat_openssl.h | 0 src/{common => lib/crypt_ops}/crypto.c | 0 src/{common => lib/crypt_ops}/crypto.h | 0 src/{common => lib/crypt_ops}/crypto_curve25519.c | 0 src/{common => lib/crypt_ops}/crypto_curve25519.h | 0 src/{common => lib/crypt_ops}/crypto_dh.c | 0 src/{common => lib/crypt_ops}/crypto_dh.h | 0 src/{common => lib/crypt_ops}/crypto_digest.c | 0 src/{common => lib/crypt_ops}/crypto_digest.h | 0 src/{common => lib/crypt_ops}/crypto_ed25519.c | 0 src/{common => lib/crypt_ops}/crypto_ed25519.h | 0 src/{common => lib/crypt_ops}/crypto_format.c | 0 src/{common => lib/crypt_ops}/crypto_format.h | 0 src/{common => lib/crypt_ops}/crypto_hkdf.c | 0 src/{common => lib/crypt_ops}/crypto_hkdf.h | 0 src/{common => lib/crypt_ops}/crypto_openssl_mgt.c | 0 src/{common => lib/crypt_ops}/crypto_openssl_mgt.h | 0 src/{common => lib/crypt_ops}/crypto_pwbox.c | 0 src/{common => lib/crypt_ops}/crypto_pwbox.h | 0 src/{common => lib/crypt_ops}/crypto_rand.c | 0 src/{common => lib/crypt_ops}/crypto_rand.h | 0 src/{common => lib/crypt_ops}/crypto_rsa.c | 0 src/{common => lib/crypt_ops}/crypto_rsa.h | 0 src/{common => lib/crypt_ops}/crypto_s2k.c | 0 src/{common => lib/crypt_ops}/crypto_s2k.h | 0 src/{common => lib/crypt_ops}/crypto_util.c | 0 src/{common => lib/crypt_ops}/crypto_util.h | 0 src/lib/crypt_ops/include.am | 44 ++++++++++++++++++++++ src/{common => lib/tls}/buffers_tls.c | 0 src/{common => lib/tls}/buffers_tls.h | 0 src/{common => lib/tls}/ciphers.inc | 0 src/lib/tls/include.am | 20 ++++++++++ src/{common => lib/tls}/tortls.c | 0 src/{common => lib/tls}/tortls.h | 0 src/rust/build.rs | 2 +- 41 files changed, 75 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index 2716bac83..d797f4f53 100644 --- a/.gitignore +++ b/.gitignore @@ -141,9 +141,6 @@ uptime-*.json /src/common/libor-ctime.a /src/common/libor-ctime-testing.a /src/common/libor-ctime.lib -/src/common/libor-crypto.a -/src/common/libor-crypto-testing.a -/src/common/libor-crypto.lib /src/common/libor-event.a /src/common/libor-event-testing.a /src/common/libor-event.lib @@ -169,10 +166,14 @@ uptime-*.json # /src/lib /src/lib/libtor-compress.a /src/lib/libtor-compress-testing.a +/src/lib/libtor-crypt-ops.a +/src/lib/libtor-crypt-ops-testing.a /src/lib/libtor-ctime.a /src/lib/libtor-ctime-testing.a /src/lib/libtor-err.a /src/lib/libtor-err-testing.a +/src/lib/libtor-tls.a +/src/lib/libtor-tls-testing.a /src/lib/libtor-trace.a # /src/or/ diff --git a/Makefile.am b/Makefile.am index 62c0e2a4a..4ccee670e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,14 +52,16 @@ TOR_UTIL_TESTING_LIBS = \ # Internal crypto libraries used in Tor TOR_CRYPTO_LIBS = \ - src/common/libor-crypto.a \ + src/lib/libtor-tls.a \ + src/lib/libtor-crypt-ops.a \ $(LIBKECCAK_TINY) \ $(LIBDONNA) # Variants of the above for linking the testing variant of tor (for coverage # and tests) TOR_CRYPTO_TESTING_LIBS = \ - src/common/libor-crypto-testing.a \ + src/lib/libtor-tls-testing.a \ + src/lib/libtor-crypt-ops-testing.a \ $(LIBKECCAK_TINY) \ $(LIBDONNA) diff --git a/src/common/include.am b/src/common/include.am index 2869c2ac9..fb5472f3b 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -1,13 +1,11 @@ noinst_LIBRARIES += \ src/common/libor.a \ - src/common/libor-crypto.a \ src/common/libor-event.a if UNITTESTS_ENABLED noinst_LIBRARIES += \ src/common/libor-testing.a \ - src/common/libor-crypto-testing.a \ src/common/libor-event-testing.a endif @@ -83,24 +81,6 @@ LIBOR_A_SRC = \ src/common/src_common_libor_testing_a-log.$(OBJEXT) \ src/common/log.$(OBJEXT): micro-revision.i -LIBOR_CRYPTO_A_SRC = \ - src/common/aes.c \ - src/common/buffers_tls.c \ - src/common/crypto.c \ - src/common/crypto_dh.c \ - src/common/crypto_digest.c \ - src/common/crypto_format.c \ - src/common/crypto_hkdf.c \ - src/common/crypto_openssl_mgt.c \ - src/common/crypto_pwbox.c \ - src/common/crypto_rand.c \ - src/common/crypto_rsa.c \ - src/common/crypto_s2k.c \ - src/common/crypto_util.c \ - src/common/tortls.c \ - src/common/crypto_curve25519.c \ - src/common/crypto_ed25519.c - LIBOR_EVENT_A_SRC = \ src/common/compat_libevent.c \ src/common/procmon.c \ @@ -108,53 +88,31 @@ LIBOR_EVENT_A_SRC = \ src/ext/timeouts/timeout.c src_common_libor_a_SOURCES = $(LIBOR_A_SRC) -src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SRC) src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SRC) if UNITTESTS_ENABLED src_common_libor_testing_a_SOURCES = $(LIBOR_A_SRC) -src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SRC) src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SRC) else src_common_libor_testing_a_SOURCES = -src_common_libor_crypto_testing_a_SOURCES = src_common_libor_event_testing_a_SOURCES = endif src_common_libor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) -src_common_libor_crypto_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_common_libor_event_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_common_libor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -src_common_libor_crypto_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) COMMONHEADERS = \ src/common/address.h \ src/common/address_set.h \ src/common/buffers.h \ - src/common/buffers_tls.h \ - src/common/aes.h \ - src/common/ciphers.inc \ src/common/compat.h \ src/common/compat_libevent.h \ - src/common/compat_openssl.h \ src/common/compat_threads.h \ src/common/compat_time.h \ src/common/confline.h \ src/common/container.h \ - src/common/crypto.h \ - src/common/crypto_dh.h \ - src/common/crypto_digest.h \ - src/common/crypto_curve25519.h \ - src/common/crypto_ed25519.h \ - src/common/crypto_format.h \ - src/common/crypto_hkdf.h \ - src/common/crypto_openssl_mgt.h \ - src/common/crypto_pwbox.h \ - src/common/crypto_rand.h \ - src/common/crypto_rsa.h \ - src/common/crypto_s2k.h \ - src/common/crypto_util.h \ src/common/handles.h \ src/common/memarea.h \ src/common/linux_syscalls.inc \ @@ -165,7 +123,6 @@ COMMONHEADERS = \ src/common/timers.h \ src/common/token_bucket.h \ src/common/torlog.h \ - src/common/tortls.h \ src/common/util.h \ src/common/util_bug.h \ src/common/util_format.h \ diff --git a/src/include.am b/src/include.am index d4b348b4e..e82943f73 100644 --- a/src/include.am +++ b/src/include.am @@ -3,6 +3,8 @@ include src/lib/err/include.am include src/lib/cc/include.am include src/lib/ctime/include.am include src/lib/compress/include.am +include src/lib/crypt_ops/include.am +include src/lib/tls/include.am include src/lib/trace/include.am include src/common/include.am include src/trunnel/include.am diff --git a/src/common/aes.c b/src/lib/crypt_ops/aes.c similarity index 100% rename from src/common/aes.c rename to src/lib/crypt_ops/aes.c diff --git a/src/common/aes.h b/src/lib/crypt_ops/aes.h similarity index 100% rename from src/common/aes.h rename to src/lib/crypt_ops/aes.h diff --git a/src/common/compat_openssl.h b/src/lib/crypt_ops/compat_openssl.h similarity index 100% rename from src/common/compat_openssl.h rename to src/lib/crypt_ops/compat_openssl.h diff --git a/src/common/crypto.c b/src/lib/crypt_ops/crypto.c similarity index 100% rename from src/common/crypto.c rename to src/lib/crypt_ops/crypto.c diff --git a/src/common/crypto.h b/src/lib/crypt_ops/crypto.h similarity index 100% rename from src/common/crypto.h rename to src/lib/crypt_ops/crypto.h diff --git a/src/common/crypto_curve25519.c b/src/lib/crypt_ops/crypto_curve25519.c similarity index 100% rename from src/common/crypto_curve25519.c rename to src/lib/crypt_ops/crypto_curve25519.c diff --git a/src/common/crypto_curve25519.h b/src/lib/crypt_ops/crypto_curve25519.h similarity index 100% rename from src/common/crypto_curve25519.h rename to src/lib/crypt_ops/crypto_curve25519.h diff --git a/src/common/crypto_dh.c b/src/lib/crypt_ops/crypto_dh.c similarity index 100% rename from src/common/crypto_dh.c rename to src/lib/crypt_ops/crypto_dh.c diff --git a/src/common/crypto_dh.h b/src/lib/crypt_ops/crypto_dh.h similarity index 100% rename from src/common/crypto_dh.h rename to src/lib/crypt_ops/crypto_dh.h diff --git a/src/common/crypto_digest.c b/src/lib/crypt_ops/crypto_digest.c similarity index 100% rename from src/common/crypto_digest.c rename to src/lib/crypt_ops/crypto_digest.c diff --git a/src/common/crypto_digest.h b/src/lib/crypt_ops/crypto_digest.h similarity index 100% rename from src/common/crypto_digest.h rename to src/lib/crypt_ops/crypto_digest.h diff --git a/src/common/crypto_ed25519.c b/src/lib/crypt_ops/crypto_ed25519.c similarity index 100% rename from src/common/crypto_ed25519.c rename to src/lib/crypt_ops/crypto_ed25519.c diff --git a/src/common/crypto_ed25519.h b/src/lib/crypt_ops/crypto_ed25519.h similarity index 100% rename from src/common/crypto_ed25519.h rename to src/lib/crypt_ops/crypto_ed25519.h diff --git a/src/common/crypto_format.c b/src/lib/crypt_ops/crypto_format.c similarity index 100% rename from src/common/crypto_format.c rename to src/lib/crypt_ops/crypto_format.c diff --git a/src/common/crypto_format.h b/src/lib/crypt_ops/crypto_format.h similarity index 100% rename from src/common/crypto_format.h rename to src/lib/crypt_ops/crypto_format.h diff --git a/src/common/crypto_hkdf.c b/src/lib/crypt_ops/crypto_hkdf.c similarity index 100% rename from src/common/crypto_hkdf.c rename to src/lib/crypt_ops/crypto_hkdf.c diff --git a/src/common/crypto_hkdf.h b/src/lib/crypt_ops/crypto_hkdf.h similarity index 100% rename from src/common/crypto_hkdf.h rename to src/lib/crypt_ops/crypto_hkdf.h diff --git a/src/common/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c similarity index 100% rename from src/common/crypto_openssl_mgt.c rename to src/lib/crypt_ops/crypto_openssl_mgt.c diff --git a/src/common/crypto_openssl_mgt.h b/src/lib/crypt_ops/crypto_openssl_mgt.h similarity index 100% rename from src/common/crypto_openssl_mgt.h rename to src/lib/crypt_ops/crypto_openssl_mgt.h diff --git a/src/common/crypto_pwbox.c b/src/lib/crypt_ops/crypto_pwbox.c similarity index 100% rename from src/common/crypto_pwbox.c rename to src/lib/crypt_ops/crypto_pwbox.c diff --git a/src/common/crypto_pwbox.h b/src/lib/crypt_ops/crypto_pwbox.h similarity index 100% rename from src/common/crypto_pwbox.h rename to src/lib/crypt_ops/crypto_pwbox.h diff --git a/src/common/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c similarity index 100% rename from src/common/crypto_rand.c rename to src/lib/crypt_ops/crypto_rand.c diff --git a/src/common/crypto_rand.h b/src/lib/crypt_ops/crypto_rand.h similarity index 100% rename from src/common/crypto_rand.h rename to src/lib/crypt_ops/crypto_rand.h diff --git a/src/common/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c similarity index 100% rename from src/common/crypto_rsa.c rename to src/lib/crypt_ops/crypto_rsa.c diff --git a/src/common/crypto_rsa.h b/src/lib/crypt_ops/crypto_rsa.h similarity index 100% rename from src/common/crypto_rsa.h rename to src/lib/crypt_ops/crypto_rsa.h diff --git a/src/common/crypto_s2k.c b/src/lib/crypt_ops/crypto_s2k.c similarity index 100% rename from src/common/crypto_s2k.c rename to src/lib/crypt_ops/crypto_s2k.c diff --git a/src/common/crypto_s2k.h b/src/lib/crypt_ops/crypto_s2k.h similarity index 100% rename from src/common/crypto_s2k.h rename to src/lib/crypt_ops/crypto_s2k.h diff --git a/src/common/crypto_util.c b/src/lib/crypt_ops/crypto_util.c similarity index 100% rename from src/common/crypto_util.c rename to src/lib/crypt_ops/crypto_util.c diff --git a/src/common/crypto_util.h b/src/lib/crypt_ops/crypto_util.h similarity index 100% rename from src/common/crypto_util.h rename to src/lib/crypt_ops/crypto_util.h diff --git a/src/lib/crypt_ops/include.am b/src/lib/crypt_ops/include.am new file mode 100644 index 000000000..b881c689d --- /dev/null +++ b/src/lib/crypt_ops/include.am @@ -0,0 +1,44 @@ + +noinst_LIBRARIES += src/lib/libtor-crypt-ops.a + +if UNITTESTS_ENABLED +noinst_LIBRARIES += src/lib/libtor-crypt-ops-testing.a +endif + +src_lib_libtor_crypt_ops_a_SOURCES = \ + src/lib/crypt_ops/aes.c \ + src/lib/crypt_ops/crypto.c \ + src/lib/crypt_ops/crypto_curve25519.c \ + src/lib/crypt_ops/crypto_dh.c \ + src/lib/crypt_ops/crypto_digest.c \ + src/lib/crypt_ops/crypto_ed25519.c \ + src/lib/crypt_ops/crypto_format.c \ + src/lib/crypt_ops/crypto_hkdf.c \ + src/lib/crypt_ops/crypto_openssl_mgt.c \ + src/lib/crypt_ops/crypto_pwbox.c \ + src/lib/crypt_ops/crypto_rand.c \ + src/lib/crypt_ops/crypto_rsa.c \ + src/lib/crypt_ops/crypto_s2k.c \ + src/lib/crypt_ops/crypto_util.c + +src_lib_libtor_crypt_ops_testing_a_SOURCES = \ + $(src_lib_libtor_crypt_ops_a_SOURCES) +src_lib_libtor_crypt_ops_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_lib_libtor_crypt_ops_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) + +noinst_HEADERS += \ + src/lib/crypt_ops/aes.h \ + src/lib/crypt_ops/compat_openssl.h \ + src/lib/crypt_ops/crypto_curve25519.h \ + src/lib/crypt_ops/crypto_dh.h \ + src/lib/crypt_ops/crypto_digest.h \ + src/lib/crypt_ops/crypto_ed25519.h \ + src/lib/crypt_ops/crypto_format.h \ + src/lib/crypt_ops/crypto.h \ + src/lib/crypt_ops/crypto_hkdf.h \ + src/lib/crypt_ops/crypto_openssl_mgt.h \ + src/lib/crypt_ops/crypto_pwbox.h \ + src/lib/crypt_ops/crypto_rand.h \ + src/lib/crypt_ops/crypto_rsa.h \ + src/lib/crypt_ops/crypto_s2k.h \ + src/lib/crypt_ops/crypto_util.h diff --git a/src/common/buffers_tls.c b/src/lib/tls/buffers_tls.c similarity index 100% rename from src/common/buffers_tls.c rename to src/lib/tls/buffers_tls.c diff --git a/src/common/buffers_tls.h b/src/lib/tls/buffers_tls.h similarity index 100% rename from src/common/buffers_tls.h rename to src/lib/tls/buffers_tls.h diff --git a/src/common/ciphers.inc b/src/lib/tls/ciphers.inc similarity index 100% rename from src/common/ciphers.inc rename to src/lib/tls/ciphers.inc diff --git a/src/lib/tls/include.am b/src/lib/tls/include.am new file mode 100644 index 000000000..b3b013f4d --- /dev/null +++ b/src/lib/tls/include.am @@ -0,0 +1,20 @@ + +noinst_LIBRARIES += src/lib/libtor-tls.a + +if UNITTESTS_ENABLED +noinst_LIBRARIES += src/lib/libtor-tls-testing.a +endif + +src_lib_libtor_tls_a_SOURCES = \ + src/lib/tls/buffers_tls.c \ + src/lib/tls/tortls.c + +src_lib_libtor_tls_testing_a_SOURCES = \ + $(src_lib_libtor_tls_a_SOURCES) +src_lib_libtor_tls_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_lib_libtor_tls_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) + +noinst_HEADERS += \ + src/lib/tls/ciphers.inc \ + src/lib/tls/buffers_tls.h \ + src/lib/tls/tortls.h diff --git a/src/common/tortls.c b/src/lib/tls/tortls.c similarity index 100% rename from src/common/tortls.c rename to src/lib/tls/tortls.c diff --git a/src/common/tortls.h b/src/lib/tls/tortls.h similarity index 100% rename from src/common/tortls.h rename to src/lib/tls/tortls.h diff --git a/src/rust/build.rs b/src/rust/build.rs index f9b40689f..8b0ea8ed6 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -149,7 +149,7 @@ pub fn main() { // will have dependencies on all the other rust packages that // tor uses. We must be careful with factoring and dependencies // moving forward! - cfg.component("or-crypto-testing"); + cfg.component("tor-crypt-ops-testing"); cfg.component("or-testing"); cfg.component("tor-err-testing"); cfg.component("or-event-testing");

1 0

[tor/master] Move testsupport.h to its own directory
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 5b8f4769dc93bf3c934dd6b2fdfec2977b8bee55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 13:12:06 2018 -0400 Move testsupport.h to its own directory --- src/common/include.am | 1 - src/include.am | 1 + src/lib/testsupport/include.am | 3 +++ src/{common => lib/testsupport}/testsupport.h | 0 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/common/include.am b/src/common/include.am index 3b49220ce..29bbdd769 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -94,7 +94,6 @@ COMMONHEADERS = \ src/common/procmon.h \ src/common/sandbox.h \ src/common/storagedir.h \ - src/common/testsupport.h \ src/common/timers.h \ src/common/token_bucket.h \ src/common/torlog.h \ diff --git a/src/include.am b/src/include.am index 685fe3433..c70a68188 100644 --- a/src/include.am +++ b/src/include.am @@ -5,6 +5,7 @@ include src/lib/ctime/include.am include src/lib/compress/include.am include src/lib/crypt_ops/include.am include src/lib/include.libdonna.am +include src/lib/testsupport/include.am include src/lib/tls/include.am include src/lib/trace/include.am include src/common/include.am diff --git a/src/lib/testsupport/include.am b/src/lib/testsupport/include.am new file mode 100644 index 000000000..b2aa62098 --- /dev/null +++ b/src/lib/testsupport/include.am @@ -0,0 +1,3 @@ + +noinst_HEADERS += \ + src/lib/testsupport/testsupport.h diff --git a/src/common/testsupport.h b/src/lib/testsupport/testsupport.h similarity index 100% rename from src/common/testsupport.h rename to src/lib/testsupport/testsupport.h

1 0

[tor/master] Rectify include paths (automated).
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 3305ae50442aaed13a9e15c392439c348e6182be Author: Nick Mathewson <nickm(a)torproject.org> 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 <sys/param.h> #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 <pthread.h> 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 <syslog.h> 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 <stdio.h> #include <stdlib.h> #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 * calling assert() normally. diff --git a/src/common/util_format.h b/src/common/util_format.h index e49efd05c..3580c2863 100644 --- a/src/common/util_format.h +++ b/src/common/util_format.h @@ -7,7 +7,7 @@ #ifndef TOR_UTIL_FORMAT_H #define TOR_UTIL_FORMAT_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "lib/cc/torint.h" /** @{ */ diff --git a/src/lib/crypt_ops/crypto_curve25519.h b/src/lib/crypt_ops/crypto_curve25519.h index 8a3386611..2e614848e 100644 --- a/src/lib/crypt_ops/crypto_curve25519.h +++ b/src/lib/crypt_ops/crypto_curve25519.h @@ -4,7 +4,7 @@ #ifndef TOR_CRYPTO_CURVE25519_H #define TOR_CRYPTO_CURVE25519_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "lib/cc/torint.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_openssl_mgt.h" diff --git a/src/lib/crypt_ops/crypto_ed25519.h b/src/lib/crypt_ops/crypto_ed25519.h index 69afb60ab..de992aaa8 100644 --- a/src/lib/crypt_ops/crypto_ed25519.h +++ b/src/lib/crypt_ops/crypto_ed25519.h @@ -4,7 +4,7 @@ #ifndef TOR_CRYPTO_ED25519_H #define TOR_CRYPTO_ED25519_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "lib/cc/torint.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "common/util.h" diff --git a/src/lib/crypt_ops/crypto_format.h b/src/lib/crypt_ops/crypto_format.h index e0d9894f1..77983f216 100644 --- a/src/lib/crypt_ops/crypto_format.h +++ b/src/lib/crypt_ops/crypto_format.h @@ -7,7 +7,7 @@ #ifndef TOR_CRYPTO_FORMAT_H #define TOR_CRYPTO_FORMAT_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "lib/cc/torint.h" #include "lib/crypt_ops/crypto_ed25519.h" diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 9fd8c1075..0bd7b078c 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -26,7 +26,7 @@ #include "lib/crypt_ops/compat_openssl.h" #include "lib/crypt_ops/crypto_util.h" #include "common/sandbox.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "common/torlog.h" #include "common/util.h" #include "common/util_format.h" diff --git a/src/lib/crypt_ops/crypto_rsa.h b/src/lib/crypt_ops/crypto_rsa.h index 31f7f2484..3faec1237 100644 --- a/src/lib/crypt_ops/crypto_rsa.h +++ b/src/lib/crypt_ops/crypto_rsa.h @@ -18,7 +18,7 @@ #include "lib/crypt_ops/crypto_digest.h" #include <stdio.h> #include "lib/cc/torint.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "common/compat.h" #include "common/util.h" #include "common/torlog.h" diff --git a/src/lib/tls/tortls.h b/src/lib/tls/tortls.h index 901cae49f..c46b46d2f 100644 --- a/src/lib/tls/tortls.h +++ b/src/lib/tls/tortls.h @@ -14,7 +14,7 @@ #include "lib/crypt_ops/crypto_rsa.h" #include "lib/crypt_ops/compat_openssl.h" #include "common/compat.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" /* Opaque structure to hold a TLS connection. */ typedef struct tor_tls_t tor_tls_t; diff --git a/src/or/addressmap.h b/src/or/addressmap.h index 0d53e7777..b0db5c8b4 100644 --- a/src/or/addressmap.h +++ b/src/or/addressmap.h @@ -7,7 +7,7 @@ #ifndef TOR_ADDRESSMAP_H #define TOR_ADDRESSMAP_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" void addressmap_init(void); void addressmap_clear_excluded_trackexithosts(const or_options_t *options); diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index 9f80c3efd..8b41424ee 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -12,7 +12,7 @@ #ifndef TOR_CIRCUITLIST_H #define TOR_CIRCUITLIST_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "or/hs_ident.h" /** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert diff --git a/src/or/circuitmux.h b/src/or/circuitmux.h index 68bcbf6e7..e94cc354c 100644 --- a/src/or/circuitmux.h +++ b/src/or/circuitmux.h @@ -10,7 +10,7 @@ #define TOR_CIRCUITMUX_H #include "or/or.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" typedef struct circuitmux_policy_s circuitmux_policy_t; typedef struct circuitmux_policy_data_s circuitmux_policy_data_t; diff --git a/src/or/config.h b/src/or/config.h index a94cd7753..dc3322e6b 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -12,7 +12,7 @@ #ifndef TOR_CONFIG_H #define TOR_CONFIG_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(DARWIN) #define KERNEL_MAY_SUPPORT_IPFW diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 9d480aec2..d6774668d 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -12,7 +12,7 @@ #ifndef TOR_CONNECTION_EDGE_H #define TOR_CONNECTION_EDGE_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" edge_connection_t *TO_EDGE_CONN(connection_t *); entry_connection_t *TO_ENTRY_CONN(connection_t *); diff --git a/src/or/dirauth/dircollate.h b/src/or/dirauth/dircollate.h index 1d403b20f..aae782978 100644 --- a/src/or/dirauth/dircollate.h +++ b/src/or/dirauth/dircollate.h @@ -12,7 +12,7 @@ #ifndef TOR_DIRCOLLATE_H #define TOR_DIRCOLLATE_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "or/or.h" typedef struct dircollator_s dircollator_t; diff --git a/src/or/dirserv.h b/src/or/dirserv.h index a8d5ac616..757eba7ba 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -12,7 +12,7 @@ #ifndef TOR_DIRSERV_H #define TOR_DIRSERV_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" /** What fraction (1 over this number) of the relay ID space do we * (as a directory authority) launch connections to at each reachability diff --git a/src/or/geoip.h b/src/or/geoip.h index 8a5dd701e..3a991038a 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -12,7 +12,7 @@ #ifndef TOR_GEOIP_H #define TOR_GEOIP_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "or/dos.h" #ifdef GEOIP_PRIVATE diff --git a/src/or/hibernate.h b/src/or/hibernate.h index cdef33543..bfd8571cd 100644 --- a/src/or/hibernate.h +++ b/src/or/hibernate.h @@ -12,7 +12,7 @@ #ifndef TOR_HIBERNATE_H #define TOR_HIBERNATE_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" int accounting_parse_options(const or_options_t *options, int validate_only); MOCK_DECL(int, accounting_is_enabled, (const or_options_t *options)); diff --git a/src/or/keypin.h b/src/or/keypin.h index b8b9ff597..73a76be56 100644 --- a/src/or/keypin.h +++ b/src/or/keypin.h @@ -4,7 +4,7 @@ #ifndef TOR_KEYPIN_H #define TOR_KEYPIN_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" int keypin_check_and_add(const uint8_t *rsa_id_digest, const uint8_t *ed25519_id_key, diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 97b90dab6..cc6badf0b 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -12,7 +12,7 @@ #ifndef TOR_NETWORKSTATUS_H #define TOR_NETWORKSTATUS_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" void networkstatus_reset_warnings(void); void networkstatus_reset_download_failures(void); diff --git a/src/or/router.h b/src/or/router.h index 4a383ac42..54f61c45a 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -12,7 +12,7 @@ #ifndef TOR_ROUTER_H #define TOR_ROUTER_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #define TOR_ROUTERINFO_ERROR_NO_EXT_ADDR (-1) #define TOR_ROUTERINFO_ERROR_CANNOT_PARSE (-2) diff --git a/src/or/routerlist.h b/src/or/routerlist.h index a90c26b44..6d1e2a0b8 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -11,7 +11,7 @@ #ifndef TOR_ROUTERLIST_H #define TOR_ROUTERLIST_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" int get_n_authorities(dirinfo_type_t type); int trusted_dirs_reload_certs(void); diff --git a/src/or/scheduler.h b/src/or/scheduler.h index 37c192fea..856923f9a 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -11,7 +11,7 @@ #include "or/or.h" #include "or/channel.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" /** Scheduler type, we build an ordered list with those values from the * parsed strings in Schedulers. The reason to do such a thing is so we can diff --git a/src/or/status.h b/src/or/status.h index 840ec1198..7258ed593 100644 --- a/src/or/status.h +++ b/src/or/status.h @@ -4,7 +4,7 @@ #ifndef TOR_STATUS_H #define TOR_STATUS_H -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" int log_heartbeat(time_t now); diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index b48bf0f16..7edfdc114 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -7,7 +7,7 @@ #define TOR_TIMERS_PRIVATE #include "or/or.h" #include "test/test.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "or/connection.h" #include "or/connection_or.h" #include "or/channel.h"

1 0

[tor/master] Merge branch 'extract_easy_common_libs'
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 8918bd90e9ddc135c0519177a07cd7a8c18859ed Merge: 471418bef 3305ae504 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 13:57:13 2018 -0400 Merge branch 'extract_easy_common_libs' .gitignore | 13 +- Makefile.am | 14 +- src/common/address.h | 2 +- src/common/address_set.c | 2 +- src/common/address_set.h | 2 +- src/common/buffers.c | 4 +- src/common/buffers.h | 4 +- src/common/compat.h | 54 +------ src/common/compat_libevent.c | 2 +- src/common/compat_libevent.h | 2 +- src/common/compat_threads.h | 4 +- src/common/container.c | 2 +- src/common/include.am | 83 ---------- src/common/pubsub.c | 129 --------------- src/common/pubsub.h | 179 --------------------- src/common/sandbox.c | 2 +- src/common/sandbox.h | 2 +- src/common/timers.h | 2 +- src/common/token_bucket.h | 4 +- src/common/torlog.h | 2 +- src/common/util.c | 4 +- src/common/util.h | 4 +- src/common/util_bug.h | 2 +- src/common/util_format.c | 2 +- src/common/util_format.h | 4 +- src/common/workqueue.c | 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-hash-custom.h | 2 +- src/ext/ed25519/donna/ed25519-randombytes-custom.h | 2 +- src/ext/ed25519/donna/ed25519_donna_tor.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/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/ed25519/ref10/keypair.c | 4 +- src/ext/ed25519/ref10/randombytes.h | 2 +- src/ext/keccak-tiny/keccak-tiny-unrolled.c | 2 +- src/ext/keccak-tiny/keccak-tiny.h | 2 +- src/ext/mulodi/mulodi4.c | 2 +- src/include.am | 8 +- src/{common => lib/cc}/compat_compiler.h | 48 ++++++ src/lib/cc/include.am | 4 + src/{common => lib/cc}/torint.h | 0 src/{common => lib/compress}/compress.c | 12 +- src/{common => lib/compress}/compress.h | 0 src/{common => lib/compress}/compress_lzma.c | 4 +- src/{common => lib/compress}/compress_lzma.h | 0 src/{common => lib/compress}/compress_none.c | 4 +- src/{common => lib/compress}/compress_none.h | 0 src/{common => lib/compress}/compress_zlib.c | 4 +- src/{common => lib/compress}/compress_zlib.h | 0 src/{common => lib/compress}/compress_zstd.c | 4 +- src/{common => lib/compress}/compress_zstd.h | 0 src/lib/compress/include.am | 25 +++ src/{common => lib/crypt_ops}/aes.c | 6 +- src/{common => lib/crypt_ops}/aes.h | 0 src/{common => lib/crypt_ops}/compat_openssl.h | 2 +- src/{common => lib/crypt_ops}/crypto.c | 24 +-- src/{common => lib/crypt_ops}/crypto.h | 4 +- src/{common => lib/crypt_ops}/crypto_curve25519.c | 10 +- src/{common => lib/crypt_ops}/crypto_curve25519.h | 8 +- src/{common => lib/crypt_ops}/crypto_dh.c | 10 +- src/{common => lib/crypt_ops}/crypto_dh.h | 0 src/{common => lib/crypt_ops}/crypto_digest.c | 6 +- src/{common => lib/crypt_ops}/crypto_digest.h | 2 +- src/{common => lib/crypt_ops}/crypto_ed25519.c | 12 +- src/{common => lib/crypt_ops}/crypto_ed25519.h | 6 +- src/{common => lib/crypt_ops}/crypto_format.c | 10 +- src/{common => lib/crypt_ops}/crypto_format.h | 6 +- src/{common => lib/crypt_ops}/crypto_hkdf.c | 8 +- src/{common => lib/crypt_ops}/crypto_hkdf.h | 0 src/{common => lib/crypt_ops}/crypto_openssl_mgt.c | 4 +- src/{common => lib/crypt_ops}/crypto_openssl_mgt.h | 0 src/{common => lib/crypt_ops}/crypto_pwbox.c | 12 +- src/{common => lib/crypt_ops}/crypto_pwbox.h | 2 +- src/{common => lib/crypt_ops}/crypto_rand.c | 8 +- src/{common => lib/crypt_ops}/crypto_rand.h | 2 +- src/{common => lib/crypt_ops}/crypto_rsa.c | 16 +- src/{common => lib/crypt_ops}/crypto_rsa.h | 6 +- src/{common => lib/crypt_ops}/crypto_s2k.c | 12 +- src/{common => lib/crypt_ops}/crypto_s2k.h | 2 +- src/{common => lib/crypt_ops}/crypto_util.c | 2 +- src/{common => lib/crypt_ops}/crypto_util.h | 2 +- src/lib/crypt_ops/include.am | 44 +++++ src/lib/ctime/di_ops.c | 2 - src/lib/ctime/di_ops.h | 2 +- src/lib/err/backtrace.h | 2 +- src/lib/err/include.am | 2 + src/lib/err/torerr.h | 2 +- src/lib/include.libdonna.am | 24 +++ src/lib/testsupport/include.am | 3 + src/{common => lib/testsupport}/testsupport.h | 0 src/{common => lib/tls}/buffers_tls.c | 8 +- src/{common => lib/tls}/buffers_tls.h | 0 src/{common => lib/tls}/ciphers.inc | 0 src/lib/tls/include.am | 20 +++ src/{common => lib/tls}/tortls.c | 11 +- src/{common => lib/tls}/tortls.h | 6 +- src/{ => lib}/trace/debug.h | 0 src/{ => lib}/trace/events.h | 2 +- src/lib/trace/include.am | 18 +++ src/{ => lib}/trace/trace.c | 2 +- src/{ => lib}/trace/trace.h | 0 src/or/addressmap.c | 2 +- src/or/addressmap.h | 2 +- src/or/channelpadding.c | 2 +- src/or/circpathbias.c | 2 +- src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 12 +- src/or/circuitlist.h | 2 +- src/or/circuitmux.h | 2 +- src/or/circuitmux_ewma.c | 2 +- src/or/circuitstats.c | 2 +- src/or/command.c | 2 +- src/or/config.c | 6 +- src/or/config.h | 2 +- src/or/connection.c | 4 +- src/or/connection_edge.c | 2 +- src/or/connection_edge.h | 2 +- src/or/connection_or.c | 4 +- src/or/conscache.c | 2 +- src/or/control.c | 6 +- src/or/cpuworker.c | 4 +- src/or/dir_server_st.h | 2 +- src/or/dirauth/dircollate.h | 2 +- src/or/dirauth/shared_random.c | 4 +- src/or/dirauth/shared_random_state.c | 2 +- src/or/directory.c | 4 +- src/or/dirserv.h | 2 +- src/or/dns.c | 2 +- src/or/dos.c | 2 +- src/or/entry_port_cfg_st.h | 2 +- src/or/entrynodes.c | 2 +- src/or/ext_orport.c | 4 +- src/or/geoip.h | 2 +- src/or/hibernate.c | 2 +- src/or/hibernate.h | 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 | 6 +- src/or/keypin.h | 2 +- src/or/main.c | 8 +- src/or/networkstatus.c | 4 +- src/or/networkstatus.h | 2 +- src/or/onion.c | 2 +- src/or/onion_fast.c | 4 +- src/or/onion_ntor.c | 8 +- src/or/onion_ntor.h | 4 +- src/or/onion_tap.c | 4 +- src/or/or.h | 18 +-- src/or/parsecommon.h | 2 +- src/or/proto_socks.c | 2 +- src/or/relay.c | 6 +- src/or/relay_crypto.c | 2 +- src/or/rendclient.c | 4 +- src/or/rendcommon.c | 4 +- src/or/rendmid.c | 2 +- src/or/rendservice.c | 4 +- src/or/rephist.c | 2 +- src/or/router.c | 6 +- src/or/router.h | 2 +- src/or/routerkeys.c | 4 +- src/or/routerkeys.h | 2 +- src/or/routerlist.c | 4 +- src/or/routerlist.h | 2 +- src/or/routerparse.c | 2 +- src/or/scheduler.h | 2 +- src/or/status.h | 2 +- src/or/torcert.c | 2 +- src/or/torcert.h | 2 +- src/rust/build.rs | 2 +- src/test/bench.c | 6 +- src/test/fuzz/fuzz_hsdescv3.c | 2 +- src/test/fuzz/fuzzing_common.c | 4 +- src/test/hs_test_helpers.c | 2 +- src/test/include.am | 1 - src/test/rend_test_helpers.c | 2 +- src/test/test-memwipe.c | 2 +- src/test/test-timers.c | 2 +- src/test/test.c | 8 +- src/test/test.h | 2 - src/test/test_addr.c | 2 +- src/test/test_address_set.c | 2 +- src/test/test_buffers.c | 4 +- src/test/test_cell_formats.c | 2 +- src/test/test_channel.c | 2 +- src/test/test_channelpadding.c | 2 +- src/test/test_channeltls.c | 2 +- src/test/test_consdiffmgr.c | 2 +- src/test/test_containers.c | 2 +- src/test/test_crypto.c | 8 +- src/test/test_crypto_openssl.c | 4 +- src/test/test_crypto_slow.c | 6 +- src/test/test_dir.c | 4 +- src/test/test_dir_handle_get.c | 2 +- src/test/test_dos.c | 2 +- src/test/test_entrynodes.c | 2 +- src/test/test_extorport.c | 2 +- src/test/test_helpers.c | 2 +- src/test/test_hs_cell.c | 4 +- src/test/test_hs_client.c | 2 +- src/test/test_hs_common.c | 2 +- src/test/test_hs_descriptor.c | 6 +- src/test/test_hs_intropoint.c | 2 +- src/test/test_hs_ntor_cl.c | 4 +- src/test/test_hs_service.c | 2 +- src/test/test_introduce.c | 2 +- src/test/test_nodelist.c | 2 +- src/test/test_ntor_cl.c | 4 +- src/test/test_oom.c | 2 +- src/test/test_pubsub.c | 85 ---------- src/test/test_relaycell.c | 2 +- src/test/test_relaycrypt.c | 2 +- src/test/test_router.c | 4 +- src/test/test_routerkeys.c | 2 +- src/test/test_routerlist.c | 2 +- src/test/test_shared_random.c | 2 +- src/test/test_storagedir.c | 2 +- src/test/test_tortls.c | 2 +- src/test/test_util.c | 4 +- src/test/test_util_format.c | 2 +- src/test/test_util_slow.c | 2 +- src/test/test_workqueue.c | 4 +- src/test/testing_common.c | 2 +- src/test/testing_rsakeys.c | 2 +- src/tools/tor-gencert.c | 8 +- src/trace/include.am | 19 --- src/trunnel/trunnel-local.h | 2 +- 250 files changed, 595 insertions(+), 947 deletions(-)

1 0

[tor/master] Move responsibility for libdonna out of src/common
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit e9943d5459c30a7dba8fa99c7f1537e3ab208749 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 13:04:09 2018 -0400 Move responsibility for libdonna out of src/common --- .gitignore | 3 +-- src/common/include.am | 25 ------------------------- src/include.am | 1 + src/lib/include.libdonna.am | 24 ++++++++++++++++++++++++ 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index d797f4f53..07fa3afac 100644 --- a/.gitignore +++ b/.gitignore @@ -144,8 +144,6 @@ uptime-*.json /src/common/libor-event.a /src/common/libor-event-testing.a /src/common/libor-event.lib -/src/common/libcurve25519_donna.a -/src/common/libcurve25519_donna.lib # /src/config/ /src/config/Makefile @@ -164,6 +162,7 @@ uptime-*.json /src/ext/keccak-tiny/libkeccak-tiny.lib # /src/lib +/src/lib/libcurve25519_donna.a /src/lib/libtor-compress.a /src/lib/libtor-compress-testing.a /src/lib/libtor-crypt-ops.a diff --git a/src/common/include.am b/src/common/include.am index fb5472f3b..3b49220ce 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -17,31 +17,6 @@ else libor_extra_source= endif -src_common_libcurve25519_donna_a_CFLAGS= - -if BUILD_CURVE25519_DONNA -src_common_libcurve25519_donna_a_SOURCES=\ - src/ext/curve25519_donna/curve25519-donna.c -# See bug 13538 -- this code is known to have signed overflow issues. -src_common_libcurve25519_donna_a_CFLAGS+=\ - @F_OMIT_FRAME_POINTER@ @CFLAGS_CONSTTIME@ -noinst_LIBRARIES+=src/common/libcurve25519_donna.a -LIBDONNA=src/common/libcurve25519_donna.a -else -if BUILD_CURVE25519_DONNA_C64 -src_common_libcurve25519_donna_a_CFLAGS+=@CFLAGS_CONSTTIME@ -src_common_libcurve25519_donna_a_SOURCES=\ - src/ext/curve25519_donna/curve25519-donna-c64.c -noinst_LIBRARIES+=src/common/libcurve25519_donna.a -LIBDONNA=src/common/libcurve25519_donna.a -else -LIBDONNA= -endif -endif - -LIBDONNA += $(LIBED25519_REF10) -LIBDONNA += $(LIBED25519_DONNA) - if THREADS_PTHREADS threads_impl_source=src/common/compat_pthreads.c endif diff --git a/src/include.am b/src/include.am index e82943f73..685fe3433 100644 --- a/src/include.am +++ b/src/include.am @@ -4,6 +4,7 @@ include src/lib/cc/include.am include src/lib/ctime/include.am include src/lib/compress/include.am include src/lib/crypt_ops/include.am +include src/lib/include.libdonna.am include src/lib/tls/include.am include src/lib/trace/include.am include src/common/include.am diff --git a/src/lib/include.libdonna.am b/src/lib/include.libdonna.am new file mode 100644 index 000000000..5b92dc58a --- /dev/null +++ b/src/lib/include.libdonna.am @@ -0,0 +1,24 @@ +src_lib_libcurve25519_donna_a_CFLAGS= + +if BUILD_CURVE25519_DONNA +src_lib_libcurve25519_donna_a_SOURCES=\ + src/ext/curve25519_donna/curve25519-donna.c +# See bug 13538 -- this code is known to have signed overflow issues. +src_lib_libcurve25519_donna_a_CFLAGS+=\ + @F_OMIT_FRAME_POINTER@ @CFLAGS_CONSTTIME@ +noinst_LIBRARIES+=src/lib/libcurve25519_donna.a +LIBDONNA=src/lib/libcurve25519_donna.a +else +if BUILD_CURVE25519_DONNA_C64 +src_lib_libcurve25519_donna_a_CFLAGS+=@CFLAGS_CONSTTIME@ +src_lib_libcurve25519_donna_a_SOURCES=\ + src/ext/curve25519_donna/curve25519-donna-c64.c +noinst_LIBRARIES+=src/lib/libcurve25519_donna.a +LIBDONNA=src/lib/libcurve25519_donna.a +else +LIBDONNA= +endif +endif + +LIBDONNA += $(LIBED25519_REF10) +LIBDONNA += $(LIBED25519_DONNA)

1 0

[translation/https_everywhere] Removing "ms" dead locale
by translation＠torproject.org 21 Jun '18

21 Jun '18

commit f152550e4c59efc0ac4dae04db896652d55c1e94 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 21 17:22:38 2018 +0000 Removing "ms" dead locale --- ms/https-everywhere.dtd | 42 ------------------------------------------ ms/https-everywhere.properties | 7 ------- 2 files changed, 49 deletions(-) diff --git a/ms/https-everywhere.dtd b/ms/https-everywhere.dtd deleted file mode 100644 index b73224d5a..000000000 --- a/ms/https-everywhere.dtd +++ /dev/null @@ -1,42 +0,0 @@ -<!ENTITY https-everywhere.about.title ""> -<!ENTITY https-everywhere.about.ext_name ""> -<!ENTITY https-everywhere.about.ext_description ""> -<!ENTITY https-everywhere.about.version ""> -<!ENTITY https-everywhere.about.created_by ""> -<!ENTITY https-everywhere.about.librarians ""> -<!ENTITY https-everywhere.about.thanks ""> -<!ENTITY https-everywhere.about.contribute ""> -<!ENTITY https-everywhere.about.donate_tor ""> -<!ENTITY https-everywhere.about.tor_lang_code ""> -<!ENTITY https-everywhere.about.donate_eff ""> - -<!ENTITY https-everywhere.menu.about ""> -<!ENTITY https-everywhere.menu.observatory ""> -<!ENTITY https-everywhere.menu.globalEnable ""> -<!ENTITY https-everywhere.menu.globalDisable ""> - -<!ENTITY https-everywhere.prefs.title ""> -<!ENTITY https-everywhere.prefs.enable_all ""> -<!ENTITY https-everywhere.prefs.disable_all ""> -<!ENTITY https-everywhere.prefs.reset_defaults ""> -<!ENTITY https-everywhere.prefs.search ""> -<!ENTITY https-everywhere.prefs.site ""> -<!ENTITY https-everywhere.prefs.notes ""> -<!ENTITY https-everywhere.prefs.list_caption ""> -<!ENTITY https-everywhere.prefs.enabled ""> -<!ENTITY https-everywhere.prefs.ruleset_howto ""> -<!ENTITY https-everywhere.prefs.here_link ""> -<!ENTITY https-everywhere.prefs.toggle ""> -<!ENTITY https-everywhere.prefs.reset_default ""> -<!ENTITY https-everywhere.prefs.view_xml_source ""> - -<!ENTITY https-everywhere.source.downloading ""> -<!ENTITY https-everywhere.source.filename ""> -<!ENTITY https-everywhere.source.unable_to_download ""> - -<!ENTITY https-everywhere.popup.title ""> -<!ENTITY https-everywhere.popup.paragraph1 ""> -<!ENTITY https-everywhere.popup.paragraph2 ""> -<!ENTITY https-everywhere.popup.paragraph3 ""> -<!ENTITY https-everywhere.popup.keep ""> -<!ENTITY https-everywhere.popup.revert ""> diff --git a/ms/https-everywhere.properties b/ms/https-everywhere.properties deleted file mode 100644 index 3cfced841..000000000 --- a/ms/https-everywhere.properties +++ /dev/null @@ -1,7 +0,0 @@ -# https-everywhere.menu.globalEnable = Enable HTTPS Everywhere -# https-everywhere.menu.globalDisable = Disable HTTPS Everywhere -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) -# https-everywhere.menu.unknownRules = (Rules for This Page Unknown) -# https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. -# https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2018