Rectify include paths (automated)

diff --git a/src/common/address_set.c b/src/common/address_set.c
index 763db64280f0edb788e5f65cb481be14f4cba3e9..65c4cbf1e1ce534410602f387903cb13f63a225d 100644 (file)
--- 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 c99de1ac347fce232a9021f008d36f5d9edea224..e3216bfc44ec56a8cea29881e953b02812cb6a46 100644 (file)
--- 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 c66ea012a9445c786ef4be3b5e289212642bde19..c30e84ba24e1a2459870fcdf841f4d2207896a72 100644 (file)
--- 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 f9d64cfb90e7889f1022a2d6e0fbe6b9d194d853..fd1bb815d451807fd418a3ff6ad23e9fe9ede9f3 100644 (file)
--- 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 0d31a2ecca856058ee62386c5b7345846296f5ec..be51e4f1064405b3fa95784bd556c1d958b74054 100644 (file)
--- 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 c176499911b8b604cf821e70229fbb18eb3fe185..ff8bbde3dacb941d937e650725ec09cb0b8a7d1b 100644 (file)
--- 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 ea7a649cddb1c839259f6ab0b8846c445fa31932..d92a51d1d369318c385959381eb3b899e05d726a 100644 (file)
--- 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 c3d4e09cd55f27ba59815aa32571e62955cba816..7f5ab398d8d35d831c06b0b4a2e54ab08cbdb69f 100644 (file)
--- 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 6408491fa5611109114e5e5b766cbc9ddad235e8..8485524e5d2364d245529c0e4674da2ce1e8516c 100644 (file)
--- 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 8ab0b4565242ae90abc9e1af723e8ecfaf05585e..25e6a90cec34e69ee1577c345828569f3339562e 100644 (file)
--- 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 8ed0a4a8f5ae9079d3d96fc0fd7c7884f64f4dcb..a6e2d4c781553df56498f9a1d380abd4659a4253 100644 (file)
--- 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 f5bc3b228dc956c1470ad4daf941c852da1b345e..c2cef10ceb00f509cbb8ce38a2a84dc0b4b2e907 100644 (file)
--- 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 233a73331cc0254746e2ba1b8a4f73e417c31db1..05cf0ec3f0b436c204deff3b5ef86c24237973df 100644 (file)
--- 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 70e48a74f30a21883321f7340b6e6e94b5dad095..c421453fddd7163ddd1bf86d0d060be2f446df7c 100644 (file)
--- 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 a94b2649275d563cce7b06a9350f73c925cfc0d6..317c01134a85ac4e9b25b56279516b483c4e474d 100644 (file)
--- 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 8a8bb2b7700951b070b0cc7811c0fe592e2a0591..b562578c596428d20f0d4592ff16948832c9b175 100644 (file)
--- 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 1324468097a9ece7f01588337154c7a399847f85..58afafed833d0d49144f2e4002dcea6827629307 100644 (file)
--- 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 f28cebb887864663cb1db8f1d31846628b090f9c..8302483d87a5693c02ba48453cd601bc6b2ec3a4 100644 (file)
--- 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 8a5b9b20186febe24d045bd23a081924c3a57557..8a338661197e2b906168e4aabf514f8593f44409 100644 (file)
--- 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 a9bd348ff4a7240c3e48130bc28f924581f70cbd..2442dae55e7425028a60e3e3d967cfc327705288 100644 (file)
--- 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 708fbf9be6090a94f5374a4eaa05a60ec9476dab..44494337c4c583ad2dbd8dac3524f75cccf8357f 100644 (file)
--- 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 b0b954796c62a2de36edbdfebc618aec252db30d..ca1030b0ae4c64487aeaa01dcc077a4e54bcc439 100644 (file)
--- 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 981b0dce2863081ab86df71a212b624878310f69..69afb60abacae398e4f5f2f7fc417546a906389c 100644 (file)
--- 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 6245b70ccbb3139cd9484d3fe2aba05fa26e7487..07008eff2ebdd33fb6225654db3ff7514dca6f6e 100644 (file)
--- 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 47f52b94b75cb2755cb8c7646e67b02572a88da4..e0d9894f128fe9f7c0712d2eb375883b9595112b 100644 (file)
--- 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 8dc15b6ffb1111b07bf8a3d2c4b2730a2de057f8..86ec4367a9d3e9007d8185b60846e228dca94ae4 100644 (file)
--- 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 8acb9cdf1cf141542314d5f4326c3aa9da0b83fa..b18717a11292c253038acead0dbb1228ae125a93 100644 (file)
--- 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 799a8799e6ad975d9e28159b98e83dc5fcd0fd18..9a315d42da01d361acf2feadc2caac5daefc6571 100644 (file)
--- 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 6c88e28d885a6229dd9c7d2b711a64bc4886727c..9fd8c10751c4ace538a10e483f79aeedcd9675c3 100644 (file)
--- 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 312898343503e0cb7e8b592c810a7df9e001fae7..a20d47132c3f16eef0e2e85a6a09515b321aa8c8 100644 (file)
--- 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 a80c46bb9f41f40f94e837524588f41ac2533abf..31f7f2484516583662cc5a11a5fd25f724f9aa95 100644 (file)
--- 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 db57691f6031386dc5451f14526f6bb49cda1cf2..722407bf485103fa517100051ba9d3a6d0112568 100644 (file)
--- 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 71707d4bfbc7ff8af96bd26dfb5d3b6d677d4477..8ef0690c156544c3d6a8b163c1f9c562f46a48ba 100644 (file)
--- 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 0a57b95529f8cbc7e7b43dce4988f70311cda919..5accb2d91acf6326bd7e682666a2329dc119d1eb 100644 (file)
--- 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 419d9c9316902feee4d37ca2fe635a6a002a1b65..ac45175c7d73e302722c0ef7228b17e45552ca70 100644 (file)
--- 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 c7b319761dc24473b45c6c10f2337132107fae70..901cae49f4d010ac246b06229bde9c5a408aa05a 100644 (file)
--- 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 9ca2326273f5156540a45bf1a699f22be697cdc9..a0df5c986525784fedeadeabb65a2bcbc6fb50a2 100644 (file)
--- 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 190f54f298890475b9e7a3c665a3d0c546f5209b..2afa483f52e70ee0b4c8bf0ad5fed015030c0d60 100644 (file)
--- 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 ace29c4a0674f08cefe12aa7635f1295f8e5191d..908b76b4864dc06a1917a610b3caacc0d278a52f 100644 (file)
--- 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 f5270827736ba72cae24098aece56b982ae531f6..28295147cc31ae7a643c1a5473156c91a10c9675 100644 (file)
--- 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 9f64a1a20f4957e2456972825dd3c58991b14eff..a696533ae4ca768668bb226a02a47d573b90264d 100644 (file)
--- 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 3b144e7d984f655c8679389972da2d33bbe17ece..1ee5f1f621c3b702f8a64c71ead2fad2abb98525 100644 (file)
--- 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 ebd082306da7df91018aaa34005773578c321b09..34605457d572028b70fd73afad717ec12bca289f 100644 (file)
--- 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 dd8e7d6f3e1f01d1191d0b4bd6f938cae17358ee..387fd49bd221a7977350b10c1393647d7cccc5c3 100644 (file)
--- 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 37e6a6f9214ff8f1d233b276f979ee16aa68ab7b..6bdb4ab7dc6f3f7dffdb59333d4097a623a2ef00 100644 (file)
--- 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 450903d6d1bcc4d9eb81a4f4a74487d2ebc303fb..e06e9c650af1dd88871a59c2cd5497974c26b407 100644 (file)
--- 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 6d6279c83174e86ada81640be0109c7df5c02359..5bb85255bb096b37dcd517d083b4d4710c750f2a 100644 (file)
--- 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 aff5f105a1155c7a97a42b9b2d84e11ac474ba41..7badcd37000a9832f29a71b26c0b051fc0da5fb6 100644 (file)
--- 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 5bfd78a78601a88bb9b92168b36ee75c07994f67..63ff0db787c1807e630fb0f591661d7df233b5dd 100644 (file)
--- 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 0460463d788394d2cbc114a9fbc7b6d089892f12..13814804a4085aa6ba438945e98690a62872db18 100644 (file)
--- 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 18b8adab86357ee475cb7406df3341947aec2c4d..24a75b16df0e18d172aae598b3b81fb020cecb3f 100644 (file)
--- 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 0860efacad965202cb1d3ecc8a30764ec63fdc18..8b53c1e7433ef243be907085eb67d96895f18a9c 100644 (file)
--- 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 9bea02e8207a342e848513a23d587639559ac71f..f77a64dfc903f24e716fbbd79e49bebbd3b64d32 100644 (file)
--- 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 9918433f5efd97eace3ef4928c85d8ceb72dfc83..2d3f7fe9a0d539b04c2c4901ae4049fb60f99fc3 100644 (file)
--- 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 3f5d39b41d6f17377fbe083194d38fd47d241e2f..8d809d8c3c8091cc471a2ddecff908dcca50c321 100644 (file)
--- 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 5f4142b0e90d77492c6e5e376d59df058b0a12e8..02bdbcf35dfc3a8d91bde29cc4ae6eebcbaa7592 100644 (file)
--- 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 6d13efda901789bf498ee34998a8abf390b03082..1fb6215906bce99f0ec7fedf1575e27fd542961a 100644 (file)
--- 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 d84f263aa6e8c380bc1e8d130d9ae0e040c6ea4b..701dc45288f3d60134f37f359583fa403ced42b2 100644 (file)
--- 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 595b8395746c43c14a5ce7e25dee43b665be1f1a..12264f758fa862b6a03d5998ada60cb84deeac20 100644 (file)
--- 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 c16a42a482402de2eec3fa2ad500a06d2061ae9f..a42fe6b1a3976d62d4f6454000e3fb2990cb84b6 100644 (file)
--- 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 5ca158781b59ef8486fc1db4cb75461ff7d62ad5..78ed81b6e024f37adcce9291a52a980d1c4d6472 100644 (file)
--- 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 40ec4ba9e73e62dde739399b9b4b6e1a75ca0396..b50c87dfa39f9cb0309bec6f4dc872ee22ded19d 100644 (file)
--- 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 36a9820446d04f52bfb9ac873579e61657891a0f..9fcb30ecc6a6ec16b675460c267a48eb92a7f66f 100644 (file)
--- 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 fbf11d1cc8b7588c37627ee7a8004e15c813b921..425070f4caf5fe08d8437aecd2d8edac7d59d9d0 100644 (file)
--- 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 331793c1faf1400863b1080e86fc6c1633e6124c..90a3fb3dcbed9b379ab6faaf93daa2fcd4783723 100644 (file)
--- 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 f7fca0b00ee2a583dcc60a97f2d2d8812e70ca38..8083910747287ae518447f99b5d227fa67440fa2 100644 (file)
--- 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 51d74bf5afea1376858d20f3eaad2ad01ca08372..e88a04620e8dae690082a97ed2c6f9eb8841b18a 100644 (file)
--- 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 fc828d0721d159f46798cb6ee633d60b35ddd586..76c40918bbe47cbad650d343913cbd6760178c53 100644 (file)
--- 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 feec0e66d4004dfc88d63a7f3fcecd473ff00428..db88cdc4a495c4a251a2797b3880cff14e96ad07 100644 (file)
--- 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 8a2df952776809b986a019675577af63a7323509..5478edc89bc5c1ccce9fe9ce1aa8a5136232f213 100644 (file)
--- 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 d3d11393f07cba09413038ff687e06de6e6c7f4f..20539ca87845ca31dafb14743b99d4569888cc6d 100644 (file)
--- 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 476cdc19eec872eb642738e31e75830b28f858d6..8c53b9dbeb3f3d6c48a4894a0ca3a56f0fb1953e 100644 (file)
--- 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 77e41647bef4222a074620ae66ae7f93ec5551f2..5f82920991d530ca274cced13a39e90e6876a1b5 100644 (file)
--- 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 61e1474aad6fd0567b94a6f11e29b0f5af377e3e..a8a76ed54da8af11ea46f7e040b5a7f0361bf400 100644 (file)
--- 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 722cc7fc5a9b52c677e8b83ef07690a1dd2eedf7..b5649e2636f724a6d1e06d36f55660673b873294 100644 (file)
--- 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 32db63bd2e538b669c576dfa3f29a77d4f2c9cc5..4676042b5469d8bfe95e247999c7e2448b8a1b77 100644 (file)
--- 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 17b5010fa56d3196917cd7021795f6b4241f6ae6..1bdb471b335cff425b4c2da231fbf834fb880dcf 100644 (file)
--- 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 35d6d62bb65278cd1ae64c905fcd74e17dafeea1..c690fdd90630d9742274ae8010f8b82a29d7ced2 100644 (file)
--- 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 649d146d4535cc8531e44e6a7c3538fadeb785e4..e6eaffffade114347c467522ef5f04e159f420e9 100644 (file)
--- 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 27e05c7cc771719829835636683129cf91479db4..776aacbf789fc03c36af2a5259dd169b2e70d9ee 100644 (file)
--- 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 7d92de038c9880b2948b566b0af3e88916523dfe..7d555c26e78f2f39d184dace92e2c4fcd56517db 100644 (file)
--- 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 d44933a2bde6eb7571d6e08a07ad270c88534eb8..a6685eb9994b9bea3463ba6764eba8a135d438a2 100644 (file)
--- 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 0dd66f1e878c9b7e76cf45b341917ae15dd895cf..b4da3a8d7949257445b85c0ef41c6c4318cfdd9b 100644 (file)
--- 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 0f9fe31be43b0b6da63b5ba51bb670399ab139ac..cf5963b19e2be1a8e726319a1d25cb213591672f 100644 (file)
--- 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 53dc8960724e8bf3d2697c5b43987bb80e87772e..cb7e84e68bf7abe2bb1163e627a4aaafce49a77c 100644 (file)
--- 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 bfd5c58b8e92f1985d476e49e26c43f1d8896c51..93e62a559dd2c20bf5dd8fe0887d33082ade23cc 100644 (file)
--- 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 d113bc9cab90e4af82519489f310abe9199fb00f..46439d66b199cf7f49cfed67203a8893ca4bb69b 100644 (file)
--- 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 230d14130542a8e67a1986245133505cdf6820c8..c81e4af3037aea2c6ac22d2b1731ec671dfb4aad 100644 (file)
--- 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 5179984e7d88fa6b1627769873b3cad63dd1b26c..6682cd86f4f14bcc260752321572ebd0da242878 100644 (file)
--- 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 6fde0ba266141540d6596d476e6d99141d372b4f..1da695706c8a47d5d5df3597a480fe2e5f97487a 100644 (file)
--- 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 2c1caa6ce562dd79dd8301481313bfbbe994e97b..1eadbd602c3fff94c5fdf55bb3528b0b4a1fa3e8 100644 (file)
--- 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 77a534712523d9a4c9a1e5c91c31ba78045c0cc9..56b65079abfa301b5f12e340f5545223d5885971 100644 (file)
--- 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 21a5a4e03b6a9ef05ce053320acf4e7ba0c827a6..b2023c72cbdfb6d41c8a59f68163c0d9e53d6ca3 100644 (file)
--- 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 c7a0a255636f014a077361bdec79434ca47708cd..a1cfc49327c03d8f05cf164651e271e5b2882ccd 100644 (file)
--- 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 4f162ceac1a240ea02d9585cc94582cbde0aa057..f13788d66f68cbd94a924656476e22ba91aac927 100644 (file)
--- 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 6bf066fbb4c05ea4dfd72f67ff6212f639a10433..9f4def0e6a2c692224882cce899585c4e6c7449e 100644 (file)
--- 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 2339495d40684c42e5c543b4fd51f10e38d4fbf5..a6f06f6e20c19316707d57646219a7cff4df5979 100644 (file)
--- 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 9a6cf8c25e6ec9fc4649342b288dc42fa7e654ed..97b3270f5b3f035d57a212e59b85d7c4a3c8c7d7 100644 (file)
--- 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 48b182817230b647585a276e342bda722f1b3fe7..a0426b96c66b61f1048c31a52becd78b472c3656 100644 (file)
--- 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 a6bbe4231dd93d98622c043415cb5fc995a00dca..23dfd3d437aff598968d0d9c375f76e0b765efeb 100644 (file)
--- 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 cba3d3622b24619df6c5dcce2249fd7204b4e007..ba5787934b4317b2b3c76d1a584613971aed4d7a 100644 (file)
--- 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 f54d8f5c609b2327ce6c7d5bfa5f868e108ef48d..49ac7269efca3031ebcf0cf5b75dcfa16d8931ef 100644 (file)
--- 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 d1ef34b6b3a2a9cbaa0b0b64eed824cc89fc6d6b..ada9fa6c2d180e90760dadbb5058137f205694e2 100644 (file)
--- 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 12ebd97bd6ef63b368ff8f4969f31ff12d97abf2..9e736ea69d43064b08e017a99e1649793f66e1ca 100644 (file)
--- 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 ea12970b92d6e0219e84459e4a6540187499b28c..d238bf8e594ab59b1176d9a6e8cfe97b22bc6ce6 100644 (file)
--- 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 6f0c1c121ba940c4a2c2011e496da2d0035ac61f..31af58c278c2a8b981921f19206994c4af8ef584 100644 (file)
--- 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 a8326aa67145518a029afabf8c4c4bff7655c3ec..16bb017c89ee7a67f036c952e59d0e16240243b0 100644 (file)
--- 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 1953ea5e313d4ef7c835479eda1beb4cdf1885ee..70f07fba4717684923055df2932e1f2a6e33b952 100644 (file)
--- 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 2f9b75ac8dad1d6ba75ffe3ed55a2d10f64230d4..1a3f4f8eb2fc17be283790e5f53b133cae8ba96f 100644 (file)
--- 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 6778fde9747cdcea344de10c10551bce1e86b5f8..0a3212adbcc4916b07f6e5478cd5976ccfa621a3 100644 (file)
--- 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 1df7b34422388bf05acd335b9d154e6972d2d969..3699685848f96e97a7b6a8e7f731ccc9384b4f99 100644 (file)
--- 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 cd4c9d0aef0e0f2a0cc37c668a377dcd75fb81f9..080325538fdfd5e151ba5f9010bf60e07c0cff0f 100644 (file)
--- 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 685b6efc36abdfadf0f2163e1ca869f8dde038a1..844fa4a16c6445031ff574bfe8f3871e2967481d 100644 (file)
--- 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 5b30c711232ce8623ba563059f1d91fd4650a9ec..d236580fbd1ec80b02035aa47c23b4135fd0adc0 100644 (file)
--- 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 08fec2de242e879fc05a47ff26cffbdc87648898..58bfaff688803f0fa0ac2b6b891fa84bdf2ae6e9 100644 (file)
--- 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 c4b89ddf036b185e46b9dcf905164a2a6c61585e..c09586afcc958fbfa7a118d7e071d21d54bfe264 100644 (file)
--- 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 1d5ee4fc97ca6593a92ff1e3a588765f96c2741c..efc6a181fd32a2a7f5506db7da88a13310b740f1 100644 (file)
--- 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 c580a1945cc3b2496b4a26b595a56c8f7dc2773b..e8a2efe5972b9834b41b463f4e48e59e15e9cbde 100644 (file)
--- 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 f33ed58d4079187244e10d71298d44bb352705b6..cc817ad702f1eafe5ffc079ee8e86fd12be45c79 100644 (file)
--- 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 c15d8deb9ee6e1328a03f078d7f3b06b7c03f8eb..9878a0d026be86eacdbf7d6fd8d407196202fb7e 100644 (file)
--- 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 56293b57873ec1a9ac5467ca50241a69d5cc3254..9578ba1d33594db62c9173d5971ec18a58dece73 100644 (file)
--- 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 7a2a87d32d5a7b6a149a73d706ee8c0bd85fe9d3..4ba24292ca820d3e3e2a55e268b39178ee5122b7 100644 (file)
--- 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 2af9c4a378a4a745797a3a7422ad3b0720e2c6d8..2391e10cd67cdeda267d71cc0c3ee4d539efe964 100644 (file)
--- 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 64ecd422f5f8f0ba6624836691207447107b14e3..3e99961ce56c616fbc9669b5f4a964234bfd8e9c 100644 (file)
--- 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 f346c15caa13d9ec9e1bdad84e9d32a6f7e77066..2b1c33aa62e38b3693f752afb849ea4b5829b3f7 100644 (file)
--- 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 f9d25ca099d4d9279be970143d10074e572f80c4..4bb3c3f77df6f2d0521ad4e96e0d3c8b8dbbf1cc 100644 (file)
--- 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 ebe75d5aa0783ab523fa16f88130f9d19b56aa7e..58002d629299914336e853366ba371717d3fdeac 100644 (file)
--- 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 1822d6c21c9361faef9c3fd83207559db48659f0..6296a709dcb22d34238cb1f2580740a305e961ef 100644 (file)
--- 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 00b25f142f9af2433033119be8577d5534f0eff2..5cc0e99c60dafa6f6e1e4a739c9c74675e9c32c0 100644 (file)
--- 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 34e51cba61b588d79922e07da48ffe4b692d3dbe..843f39423b608bc67a4d3c5eb679f646962cef6d 100644 (file)
--- 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 8c198777298fa6ae03286be5a5c1f13f0016c226..9b59f0ddb656f4bf0d062cecc68b85bce0020e51 100644 (file)
--- 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 bcf72b45467cc55b76a83fee699376fac9601d38..684ac98f420a4c7c89f0f3a49b187031904afce2 100644 (file)
--- 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 6ffb22fcac8ed638f1032b27373cdabc1764f117..f62c7f880833321291c15d2e1ca1f1da3eeb149a 100644 (file)
--- 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 0e5ad7bba7441511dfce2e6a2d03805bdd567a6b..1dc8bc2d24ad404649dad46e0e957e46108b80bf 100644 (file)
--- 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 dbc607db3dfbe06cc5f193f480fc006f6880fb13..a10cd7e9b53789919fc3db8e76001fa4e53b74c9 100644 (file)
--- 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 0edc22c50264e590a410b80460f6d4d55401ab27..c78ec4099f949922aaea7df5dba90b2fa4096886 100644 (file)
--- 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 64b0664292b16faa6d1a4c5f03e735c52fec6658..9f314b7704682effccf9b1228cb78460e7a4e8c5 100644 (file)
--- 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 0b8541974ff81fc63b933b2d1e8d2eae8a36b9c5..7f0ca06983c5de49d3b05a76ab569ad4c12359b4 100644 (file)
--- 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 f2f325785f5382f9505eadbe13c5fe1a04519458..6e9424a3ad599839d8dbe09e204cdc7f55773e2c 100644 (file)
--- 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 8cfc9f808fc81d718bfae16449d123177bacfd31..948cf0d60cf62c8e256425723ab0e07479834562 100644 (file)
--- 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 b6032ed87c69956d3849100c2c0d54843bb07712..e8f847833000bd8b0c952dfde70cdb1b326f0d15 100644 (file)
--- 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 149129d0c789d2088675f35135b3c31c03038d58..55910a351e7ac9806809a1bebfe7c987213b27ad 100644 (file)
--- 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 4deb881335948d044b21be230630c88740ac223f..4dd7673521f79edf5ad879d69d23138628115ddb 100644 (file)
--- 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 6c631494257d8a60990a67585bef30981cffd121..80f95b6c081ba14b7696b2ab4a9054283146cdfc 100644 (file)
--- 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 4e0fccdff1af1eb409a5ce0538305a8c844cd9cc..a766f8457fa6dd730c57028b4c21bb8b2f708d2c 100644 (file)
--- 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 d56915822f472229f6633861c2388210cf45270a..931a184e7aae0a62b9795d61865850b9a966c51c 100644 (file)
--- 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 3d725d50257679739ae5e916dc922f2e6ff025d9..9e4d7b0a101bf10f10ed3ba69ab0e523ef67d989 100644 (file)
--- 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 6935d286c848ba56a1bca13774e2e4bfd6743edc..fe23c5319d679a3b6f67b8f2679eeaa63acb572c 100644 (file)
--- 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 f9e60001da4f7ef35c243a94cd0cc7ab6d0c0ae2..3baeb980318a2026950488aa48ed4dace3e74d80 100644 (file)
--- 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 f45fcb11a4c8ac1f77c670fee8334c1ddf3c0ed0..087a14e64901b07e49cf894b658e8e8001680f97 100644 (file)
--- 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 07db3624ba9f41dc4b97e198b7c45454ec2e728b..c2a2e015136ef2e49fcbed0721c4cbefcc225aa5 100644 (file)
--- 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"