diff options
151 files changed, 275 insertions, 276 deletions
diff --git a/src/common/address_set.c b/src/common/address_set.c index 763db64280..65c4cbf1e1 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 c99de1ac34..e3216bfc44 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 c66ea012a9..c30e84ba24 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 f9d64cfb90..fd1bb815d4 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 0d31a2ecca..be51e4f106 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 c176499911..ff8bbde3da 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 ea7a649cdd..d92a51d1d3 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 c3d4e09cd5..7f5ab398d8 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 6408491fa5..8485524e5d 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 8ab0b45652..25e6a90cec 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 8ed0a4a8f5..a6e2d4c781 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 f5bc3b228d..c2cef10ceb 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 233a73331c..05cf0ec3f0 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 70e48a74f3..c421453fdd 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 a94b264927..317c01134a 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 8a8bb2b770..b562578c59 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 1324468097..58afafed83 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 f28cebb887..8302483d87 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 8a5b9b2018..8a33866119 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 a9bd348ff4..2442dae55e 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 708fbf9be6..44494337c4 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 b0b954796c..ca1030b0ae 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 981b0dce28..69afb60aba 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 6245b70ccb..07008eff2e 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 47f52b94b7..e0d9894f12 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 8dc15b6ffb..86ec4367a9 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 8acb9cdf1c..b18717a112 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 799a8799e6..9a315d42da 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 6c88e28d88..9fd8c10751 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 3128983435..a20d47132c 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 a80c46bb9f..31f7f24845 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 db57691f60..722407bf48 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 71707d4bfb..8ef0690c15 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 0a57b95529..5accb2d91a 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 419d9c9316..ac45175c7d 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 c7b319761d..901cae49f4 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 9ca2326273..a0df5c9865 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 190f54f298..2afa483f52 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 ace29c4a06..908b76b486 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 f527082773..28295147cc 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 9f64a1a20f..a696533ae4 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 3b144e7d98..1ee5f1f621 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 ebd082306d..34605457d5 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 dd8e7d6f3e..387fd49bd2 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 37e6a6f921..6bdb4ab7dc 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 450903d6d1..e06e9c650a 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 6d6279c831..5bb85255bb 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 aff5f105a1..7badcd3700 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 5bfd78a786..63ff0db787 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 0460463d78..13814804a4 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 <b>s</b> is the state of a control_connection_t that has diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 18b8adab86..24a75b16df 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 0860efacad..8b53c1e743 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 9bea02e820..f77a64dfc9 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 9918433f5e..2d3f7fe9a0 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 3f5d39b41d..8d809d8c3c 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 5f4142b0e9..02bdbcf35d 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 6d13efda90..1fb6215906 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 d84f263aa6..701dc45288 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 595b839574..12264f758f 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 c16a42a482..a42fe6b1a3 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 5ca158781b..78ed81b6e0 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 40ec4ba9e7..b50c87dfa3 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 36a9820446..9fcb30ecc6 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 fbf11d1cc8..425070f4ca 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 331793c1fa..90a3fb3dcb 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 f7fca0b00e..8083910747 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 51d74bf5af..e88a04620e 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 fc828d0721..76c40918bb 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 feec0e66d4..db88cdc4a4 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 8a2df95277..5478edc89b 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 d3d11393f0..20539ca878 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 476cdc19ee..8c53b9dbeb 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 77e41647be..5f82920991 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 61e1474aad..a8a76ed54d 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 722cc7fc5a..b5649e2636 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 32db63bd2e..4676042b54 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 17b5010fa5..1bdb471b33 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 35d6d62bb6..c690fdd906 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 649d146d45..e6eaffffad 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 27e05c7cc7..776aacbf78 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 7d92de038c..7d555c26e7 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 <b>victim</b>. */ void diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c index d44933a2bd..a6685eb999 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 0dd66f1e87..b4da3a8d79 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 0f9fe31be4..cf5963b19e 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 53dc896072..cb7e84e68b 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 bfd5c58b8e..93e62a559d 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 d113bc9cab..46439d66b1 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 230d141305..c81e4af303 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 5179984e7d..6682cd86f4 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 6fde0ba266..1da695706c 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 2c1caa6ce5..1eadbd602c 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 77a5347125..56b65079ab 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 21a5a4e03b..b2023c72cb 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 c7a0a25563..a1cfc49327 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 4f162ceac1..f13788d66f 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 6bf066fbb4..9f4def0e6a 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 2339495d40..a6f06f6e20 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 9a6cf8c25e..97b3270f5b 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 48b1828172..a0426b96c6 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 a6bbe4231d..23dfd3d437 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 cba3d3622b..ba5787934b 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 f54d8f5c60..49ac7269ef 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 d1ef34b6b3..ada9fa6c2d 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 12ebd97bd6..9e736ea69d 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 ea12970b92..d238bf8e59 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 6f0c1c121b..31af58c278 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 a8326aa671..16bb017c89 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 1953ea5e31..70f07fba47 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 2f9b75ac8d..1a3f4f8eb2 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 6778fde974..0a3212adbc 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 1df7b34422..3699685848 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 cd4c9d0aef..080325538f 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 685b6efc36..844fa4a16c 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 5b30c71123..d236580fbd 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 08fec2de24..58bfaff688 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 c4b89ddf03..c09586afcc 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 1d5ee4fc97..efc6a181fd 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 c580a1945c..e8a2efe597 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 f33ed58d40..cc817ad702 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 c15d8deb9e..9878a0d026 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 56293b5787..9578ba1d33 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 7a2a87d32d..4ba24292ca 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 2af9c4a378..2391e10cd6 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 64ecd422f5..3e99961ce5 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 f346c15caa..2b1c33aa62 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 f9d25ca099..4bb3c3f77d 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 ebe75d5aa0..58002d6292 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 1822d6c21c..6296a709dc 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 00b25f142f..5cc0e99c60 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 34e51cba61..843f39423b 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 8c19877729..9b59f0ddb6 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 bcf72b4546..684ac98f42 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 6ffb22fcac..f62c7f8808 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 0e5ad7bba7..1dc8bc2d24 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 dbc607db3d..a10cd7e9b5 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 0edc22c502..c78ec4099f 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 64b0664292..9f314b7704 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 0b8541974f..7f0ca06983 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 f2f325785f..6e9424a3ad 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 8cfc9f808f..948cf0d60c 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 b6032ed87c..e8f8478330 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 149129d0c7..55910a351e 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 4deb881335..4dd7673521 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 6c63149425..80f95b6c08 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 4e0fccdff1..a766f8457f 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 d56915822f..931a184e7a 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 3d725d5025..9e4d7b0a10 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 6935d286c8..fe23c5319d 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 f9e60001da..3baeb98031 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 f45fcb11a4..087a14e649 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 07db3624ba..c2a2e01513 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" |