Rectify include paths (automated)

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"
 

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"

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>

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"

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"

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;

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)

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];

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)

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) \

src/ext/ed25519/ref10/keypair.c

@@ -6,8 +6,8 @@
 #include "crypto_hash_sha512.h"
 #include "ge.h"
 
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 
 int
 crypto_sign_seckey(unsigned char *sk)

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)

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 ********/

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"

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

src/lib/crypt_ops/crypto.c

@@ -23,16 +23,16 @@
 #endif /* defined(_WIN32) */
 
 #define CRYPTO_PRIVATE
-#include "common/compat_openssl.h"
+#include "lib/crypt_ops/compat_openssl.h"
-#include "common/crypto.h"
+#include "lib/crypt_ops/crypto.h"
-#include "common/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
-#include "common/crypto_digest.h"
+#include "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_dh.h"
+#include "lib/crypt_ops/crypto_dh.h"
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
-#include "common/crypto_format.h"
+#include "lib/crypt_ops/crypto_format.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_rsa.h"
+#include "lib/crypt_ops/crypto_rsa.h"
-#include "common/crypto_util.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"

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

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 "lib/crypt_ops/crypto_curve25519.h"
-#include "common/crypto_digest.h"
+#include "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_format.h"
+#include "lib/crypt_ops/crypto_format.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "common/util.h"
 #include "common/torlog.h"
 

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 "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_openssl_mgt.h"
+#include "lib/crypt_ops/crypto_openssl_mgt.h"
 
 /** Length of a curve25519 public key when encoded. */
 #define CURVE25519_PUBKEY_LEN 32

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 "lib/crypt_ops/compat_openssl.h"
-#include "common/crypto_dh.h"
+#include "lib/crypt_ops/crypto_dh.h"
-#include "common/crypto_digest.h"
+#include "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_hkdf.h"
+#include "lib/crypt_ops/crypto_hkdf.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 
 DISABLE_GCC_WARNING(redundant-decls)
 

src/lib/crypt_ops/crypto_digest.c

@@ -11,9 +11,9 @@
  **/
 
 #include "common/container.h"
-#include "common/crypto_digest.h"
+#include "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_openssl_mgt.h"
+#include "lib/crypt_ops/crypto_openssl_mgt.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "common/torlog.h"
 
 #include "keccak-tiny/keccak-tiny.h"

src/lib/crypt_ops/crypto_ed25519.c

@@ -21,12 +21,12 @@
 #include <sys/stat.h>
 #endif
 
-#include "common/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
-#include "common/crypto_digest.h"
+#include "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
-#include "common/crypto_format.h"
+#include "lib/crypt_ops/crypto_format.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "common/torlog.h"
 #include "common/util.h"
 #include "common/util_format.h"

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

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 "lib/crypt_ops/crypto_curve25519.h"
-#include "common/crypto_digest.h"
+#include "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
-#include "common/crypto_format.h"
+#include "lib/crypt_ops/crypto_format.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "common/util.h"
 #include "common/util_format.h"
 #include "common/torlog.h"

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,

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 "lib/crypt_ops/crypto_hkdf.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
-#include "common/crypto_digest.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)

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 "lib/crypt_ops/compat_openssl.h"
-#include "common/crypto_openssl_mgt.h"
+#include "lib/crypt_ops/crypto_openssl_mgt.h"
 
 DISABLE_GCC_WARNING(redundant-decls)
 

src/lib/crypt_ops/crypto_pwbox.c

@@ -8,12 +8,12 @@
  * them to disk.
  */
 
-#include "common/crypto.h"
+#include "lib/crypt_ops/crypto.h"
-#include "common/crypto_digest.h"
+#include "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_pwbox.h"
+#include "lib/crypt_ops/crypto_pwbox.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_s2k.h"
+#include "lib/crypt_ops/crypto_s2k.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "lib/ctime/di_ops.h"
 #include "common/util.h"
 #include "trunnel/pwbox.h"

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 "lib/crypt_ops/compat_openssl.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "common/sandbox.h"
 #include "common/testsupport.h"
 #include "common/torlog.h"

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 "lib/crypt_ops/crypto.h"
-#include "common/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
-#include "common/crypto_digest.h"
+#include "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_format.h"
+#include "lib/crypt_ops/crypto_format.h"
-#include "common/compat_openssl.h"
+#include "lib/crypt_ops/compat_openssl.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_rsa.h"
+#include "lib/crypt_ops/crypto_rsa.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 
 DISABLE_GCC_WARNING(redundant-decls)
 

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"

src/lib/crypt_ops/crypto_s2k.c

@@ -13,12 +13,12 @@
 #define CRYPTO_S2K_PRIVATE
 
 #include "common/compat.h"
-#include "common/crypto.h"
+#include "lib/crypt_ops/crypto.h"
-#include "common/crypto_digest.h"
+#include "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_hkdf.h"
+#include "lib/crypt_ops/crypto_hkdf.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_s2k.h"
+#include "lib/crypt_ops/crypto_s2k.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "common/util.h"
 
 #include <openssl/evp.h>

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>
 

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

src/lib/tls/tortls.c

@@ -24,10 +24,10 @@
   #include <ws2tcpip.h>
 #endif
 
-#include "common/crypto.h"
+#include "lib/crypt_ops/crypto.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_dh.h"
+#include "lib/crypt_ops/crypto_dh.h"
-#include "common/crypto_util.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;
 }
-

src/lib/tls/tortls.h

@@ -11,8 +11,8 @@
  * \brief Headers for tortls.c
  **/
 
-#include "common/crypto_rsa.h"
+#include "lib/crypt_ops/crypto_rsa.h"
-#include "common/compat_openssl.h"
+#include "lib/crypt_ops/compat_openssl.h"
 #include "common/compat.h"
 #include "common/testsupport.h"
 

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"

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"

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"

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"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/entrynodes.h"
 #include "or/main.h"

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 ***/

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"

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"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/dirserv.h"
 #include "or/dns.h"
 #include "or/dos.h"

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"

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"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/dirserv.h"
 #include "or/entrynodes.h"
 #include "or/geoip.h"

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

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.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

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/main.h"
 #include "or/onion.h"
 #include "or/rephist.h"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/networkstatus.h"
 #include "or/router.h"
 #include "or/routerkeys.h"

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"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/dirserv.h"
 #include "or/entrynodes.h"

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"

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"

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"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/ext_orport.h"
 #include "or/main.h"
 #include "or/proto_ext_or.h"

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"

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"

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"

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"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/nodelist.h"
 #include "or/policies.h"
 #include "or/relay.h"

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"
 

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/hs_cache.h"
 #include "or/hs_cell.h"

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"
 

src/or/hs_common.c

@@ -15,8 +15,8 @@
 
 #include "or/config.h"
 #include "or/circuitbuild.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/networkstatus.h"
 #include "or/nodelist.h"
 #include "or/hs_cache.h"

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"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/parsecommon.h"
 #include "or/rendcache.h"
 #include "or/hs_cache.h"

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 "lib/crypt_ops/crypto.h"
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 #include "trunnel/ed25519_cert.h" /* needed for trunnel */
 #include "or/torcert.h"
 

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

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"
 

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. */

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 */

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/main.h"
 #include "or/networkstatus.h"

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 "lib/crypt_ops/crypto_curve25519.h"
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 #include "or/replaycache.h"
 
 #include "or/hs_common.h"

src/or/keypin.c

@@ -12,8 +12,8 @@
 
 #include "orconfig.h"
 #include "common/compat.h"
-#include "common/crypto_digest.h"
+#include "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_format.h"
+#include "lib/crypt_ops/crypto_format.h"
 #include "lib/ctime/di_ops.h"
 #include "ht.h"
 #include "or/keypin.h"

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 "lib/crypt_ops/crypto_s2k.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/directory.h"
 #include "or/dirserv.h"
 #include "or/dns.h"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/dirserv.h"
 #include "or/dos.h"

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"

src/or/onion_fast.c

@@ -29,8 +29,8 @@
 
 #include "or/or.h"
 #include "or/onion_fast.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 
 /** Release all state held in <b>victim</b>. */
 void

src/or/onion_ntor.c

@@ -21,10 +21,10 @@
 #include "orconfig.h"
 
 #define ONION_NTOR_PRIVATE
-#include "common/crypto.h"
+#include "lib/crypt_ops/crypto.h"
-#include "common/crypto_hkdf.h"
+#include "lib/crypt_ops/crypto_hkdf.h"
-#include "common/crypto_digest.h"
+#include "lib/crypt_ops/crypto_digest.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/onion_ntor.h"
 #include "common/torlog.h"
 #include "common/util.h"

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

src/or/onion_tap.c

@@ -29,8 +29,8 @@
 
 #include "or/or.h"
 #include "or/config.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/onion_tap.h"
 #include "or/rephist.h"
 

src/or/or.h

@@ -63,11 +63,11 @@
 #include <windows.h>
 #endif /* defined(_WIN32) */
 
-#include "common/crypto.h"
+#include "lib/crypt_ops/crypto.h"
-#include "common/crypto_format.h"
+#include "lib/crypt_ops/crypto_format.h"
-#include "common/crypto_dh.h"
+#include "lib/crypt_ops/crypto_dh.h"
-#include "common/crypto_hkdf.h"
+#include "lib/crypt_ops/crypto_hkdf.h"
-#include "common/tortls.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 "lib/crypt_ops/crypto_curve25519.h"
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 #include "tor_queue.h"
 #include "common/token_bucket.h"
 #include "common/util_format.h"

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

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"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/geoip.h"
 #include "or/hs_cache.h"

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"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/hs_circuit.h"
 #include "or/hs_client.h"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/hs_client.h"
 #include "or/hs_common.h"
 #include "or/hs_intropoint.h"

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"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/hs_common.h"
 #include "or/hs_config.h"

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"

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 "lib/crypt_ops/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
-#include "common/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
 #include "or/directory.h"
 #include "or/dirserv.h"
 #include "or/dns.h"

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"
 

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)

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"

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"

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"