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

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

src/ext/ed25519/ref10/randombytes.h

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

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 "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"
 

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

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)