From ef486e3c029efe8cb18886eea52f20af766f9daa Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 5 Jul 2018 16:34:59 -0400 Subject: Fix every include path changed in the previous commit (automated) I am very glad to have written this script. --- src/core/crypto/hs_ntor.c | 4 ++-- src/core/crypto/hs_ntor.h | 2 +- src/core/crypto/onion.c | 34 +++++++++++++++++----------------- src/core/crypto/onion_fast.c | 4 ++-- src/core/crypto/onion_ntor.c | 2 +- src/core/crypto/onion_tap.c | 8 ++++---- src/core/crypto/relay_crypto.c | 18 +++++++++--------- 7 files changed, 36 insertions(+), 36 deletions(-) (limited to 'src/core/crypto') diff --git a/src/core/crypto/hs_ntor.c b/src/core/crypto/hs_ntor.c index b5007545db..d98d16f7f6 100644 --- a/src/core/crypto/hs_ntor.c +++ b/src/core/crypto/hs_ntor.c @@ -24,11 +24,11 @@ * rendezvous key expansion to setup end-to-end rend circuit keys. */ -#include "or/or.h" +#include "core/or/or.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_ed25519.h" -#include "or/hs_ntor.h" +#include "core/crypto/hs_ntor.h" /* String constants used by the ntor HS protocol */ #define PROTOID "tor-hs-ntor-curve25519-sha3-256-1" diff --git a/src/core/crypto/hs_ntor.h b/src/core/crypto/hs_ntor.h index 67a9573436..30738c4ae0 100644 --- a/src/core/crypto/hs_ntor.h +++ b/src/core/crypto/hs_ntor.h @@ -4,7 +4,7 @@ #ifndef TOR_HS_NTOR_H #define TOR_HS_NTOR_H -#include "or/or.h" +#include "core/or/or.h" struct ed25519_public_key_t; struct curve25519_public_key_t; struct curve25519_keypair_t; diff --git a/src/core/crypto/onion.c b/src/core/crypto/onion.c index 80d8e1a8b1..e71bfc1fd9 100644 --- a/src/core/crypto/onion.c +++ b/src/core/crypto/onion.c @@ -62,25 +62,25 @@ * onion_fast.c for more information. **/ -#include "or/or.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/config.h" -#include "or/cpuworker.h" +#include "core/or/or.h" +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "app/config/config.h" +#include "core/mainloop/cpuworker.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_dh.h" -#include "or/networkstatus.h" -#include "or/onion.h" -#include "or/onion_fast.h" -#include "or/onion_ntor.h" -#include "or/onion_tap.h" -#include "or/relay.h" -#include "or/rephist.h" -#include "or/router.h" - -#include "or/cell_st.h" -#include "or/extend_info_st.h" -#include "or/or_circuit_st.h" +#include "feature/nodelist/networkstatus.h" +#include "core/crypto/onion.h" +#include "core/crypto/onion_fast.h" +#include "core/crypto/onion_ntor.h" +#include "core/crypto/onion_tap.h" +#include "core/or/relay.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" + +#include "core/or/cell_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/or_circuit_st.h" // trunnel #include "trunnel/ed25519_cert.h" diff --git a/src/core/crypto/onion_fast.c b/src/core/crypto/onion_fast.c index 6e834ccf95..292aeca402 100644 --- a/src/core/crypto/onion_fast.c +++ b/src/core/crypto/onion_fast.c @@ -27,8 +27,8 @@ * many RSA1024 keys. **/ -#include "or/or.h" -#include "or/onion_fast.h" +#include "core/or/or.h" +#include "core/crypto/onion_fast.h" #include "lib/crypt_ops/crypto_hkdf.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" diff --git a/src/core/crypto/onion_ntor.c b/src/core/crypto/onion_ntor.c index 59c923cb97..9e1e273ef6 100644 --- a/src/core/crypto/onion_ntor.c +++ b/src/core/crypto/onion_ntor.c @@ -29,7 +29,7 @@ #include "lib/ctime/di_ops.h" #include "lib/log/torlog.h" #include "lib/log/util_bug.h" -#include "or/onion_ntor.h" +#include "core/crypto/onion_ntor.h" #include diff --git a/src/core/crypto/onion_tap.c b/src/core/crypto/onion_tap.c index 05bcce2e87..7ffe0ea5c5 100644 --- a/src/core/crypto/onion_tap.c +++ b/src/core/crypto/onion_tap.c @@ -27,13 +27,13 @@ * invoked from onion.c. **/ -#include "or/or.h" -#include "or/config.h" +#include "core/or/or.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/onion_tap.h" -#include "or/rephist.h" +#include "core/crypto/onion_tap.h" +#include "feature/stats/rephist.h" /*----------------------------------------------------------------------*/ diff --git a/src/core/crypto/relay_crypto.c b/src/core/crypto/relay_crypto.c index 1fcfae0b3a..b2388d2c45 100644 --- a/src/core/crypto/relay_crypto.c +++ b/src/core/crypto/relay_crypto.c @@ -4,18 +4,18 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "or/or.h" -#include "or/circuitlist.h" -#include "or/config.h" +#include "core/or/or.h" +#include "core/or/circuitlist.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto.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" +#include "core/crypto/hs_ntor.h" // for HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN +#include "core/or/relay.h" +#include "core/crypto/relay_crypto.h" -#include "or/cell_st.h" -#include "or/or_circuit_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/cell_st.h" +#include "core/or/or_circuit_st.h" +#include "core/or/origin_circuit_st.h" /** Update digest from the payload of cell. Assign integrity part to * cell. -- cgit v1.2.3-54-g00ecf