From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 28 May 2025 18:34:28 +0000 (-0400)
Subject: Move relay_crypto_st.h to core/crypto.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=641be7e1d4c548335164fea85e0f866f69914706;p=thirdparty%2Ftor.git

Move relay_crypto_st.h to core/crypto.
---

diff --git a/src/core/crypto/include.am b/src/core/crypto/include.am
index b0c1486195..59b6fd74f8 100644
--- a/src/core/crypto/include.am
+++ b/src/core/crypto/include.am
@@ -18,5 +18,6 @@ noinst_HEADERS +=					\
 	src/core/crypto/onion_ntor.h			\
 	src/core/crypto/onion_ntor_v3.h			\
 	src/core/crypto/relay_crypto.h                  \
+	src/core/crypto/relay_crypto_st.h               \
         src/core/crypto/relay_crypto_cgo.h              \
 	src/core/crypto/relay_crypto_tor1.h
diff --git a/src/core/or/relay_crypto_st.h b/src/core/crypto/relay_crypto_st.h
similarity index 100%
rename from src/core/or/relay_crypto_st.h
rename to src/core/crypto/relay_crypto_st.h
diff --git a/src/core/crypto/relay_crypto_tor1.c b/src/core/crypto/relay_crypto_tor1.c
index baef282f3b..c2a832c23a 100644
--- a/src/core/crypto/relay_crypto_tor1.c
+++ b/src/core/crypto/relay_crypto_tor1.c
@@ -17,7 +17,7 @@
 #include "lib/cc/ctassert.h"
 
 #include "core/or/cell_st.h"
-#include "core/or/relay_crypto_st.h"
+#include "core/crypto/relay_crypto_st.h"
 
 /* Offset of digest within relay cell body for v0 cells. */
 #define V0_DIGEST_OFFSET 5
diff --git a/src/core/or/crypt_path_st.h b/src/core/or/crypt_path_st.h
index 5f023e9f4f..b2f4cd3087 100644
--- a/src/core/or/crypt_path_st.h
+++ b/src/core/or/crypt_path_st.h
@@ -12,7 +12,7 @@
 #ifndef CRYPT_PATH_ST_H
 #define CRYPT_PATH_ST_H
 
-#include "core/or/relay_crypto_st.h"
+#include "core/crypto/relay_crypto_st.h"
 struct crypto_dh_t;
 
 #define CRYPT_PATH_MAGIC 0x70127012u
diff --git a/src/core/or/include.am b/src/core/or/include.am
index 9b8f295297..5f75581f09 100644
--- a/src/core/or/include.am
+++ b/src/core/or/include.am
@@ -105,7 +105,6 @@ noinst_HEADERS +=					\
 	src/core/or/protover.h				\
 	src/core/or/reasons.h				\
 	src/core/or/relay.h				\
-	src/core/or/relay_crypto_st.h			\
 	src/core/or/relay_msg.h		        	\
 	src/core/or/relay_msg_st.h	        	\
 	src/core/or/scheduler.h				\
diff --git a/src/test/fakecircs.c b/src/test/fakecircs.c
index e52df022d0..47b3ae1aca 100644
--- a/src/test/fakecircs.c
+++ b/src/test/fakecircs.c
@@ -22,7 +22,7 @@
 #include "core/or/conflux.h"
 #include "core/or/crypt_path.h"
 #include "core/or/relay.h"
-#include "core/or/relay_crypto_st.h"
+#include "core/crypto/relay_crypto_st.h"
 
 #include "test/fakecircs.h"
 
diff --git a/src/test/test_crypto_cgo.c b/src/test/test_crypto_cgo.c
index 5aea89e984..3e4c44d3c5 100644
--- a/src/test/test_crypto_cgo.c
+++ b/src/test/test_crypto_cgo.c
@@ -255,7 +255,7 @@ test_crypto_cgo_uiv_testvec(void *arg)
   cgo_uiv_clear(&uiv);
 }
 
-#include "core/or/relay_crypto_st.h"
+#include "core/crypto/relay_crypto_st.h"
 
 static void
 test_crypto_cgo_uiv_update_testvec(void *arg)