Include crypto_digest.h in order to solve dependency issues.

Included crypto_digest.h in some files in order to solve xof+digest module
dependency issues. Removed crypto.h where it isn't needed anymore.

Follows #24658.

Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>

diff --git a/src/common/container.c b/src/common/container.c
index 54b0b2028fa44b7471c808cd09d2751ed5b7ac77..5386e6458b78791fb1d9838b234812b736c8165b 100644 (file)
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -15,7 +15,7 @@
 #include "util.h"
 #include "torlog.h"
 #include "container.h"
-#include "crypto.h"
+#include "crypto_digest.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/common/crypto.c b/src/common/crypto.c
index edc9e9535dbe7650723d5cd41f1d3a29dcfd4a6e..3f89dc7068c5f707bbc7e4603e290a2c659a071c 100644 (file)
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -29,6 +29,7 @@
 #include "crypto_ed25519.h"
 #include "crypto_format.h"
 #include "crypto_rsa.h"
+#include "crypto_digest.h"
 
 DISABLE_GCC_WARNING(redundant-decls)
 

diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c
index 8793fa627461b43c57f5e92c992409a17f453aec..ccf12d00f942d2deabb946a789c721248f613423 100644 (file)
--- a/src/common/crypto_curve25519.c
+++ b/src/common/crypto_curve25519.c
@@ -24,6 +24,7 @@
 #include "crypto.h"
 #include "crypto_curve25519.h"
 #include "crypto_format.h"
+#include "crypto_digest.h"
 #include "util.h"
 #include "torlog.h"
 

diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c
index 26523e312683c2129172491cb12d2ca95bed36ca..1175d68f47f8aa20d690a6d351cd183a84e31c0a 100644 (file)
--- a/src/common/crypto_ed25519.c
+++ b/src/common/crypto_ed25519.c
@@ -23,6 +23,7 @@
 
 #include "crypto.h"
 
+#include "crypto_digest.h"
 #include "crypto_curve25519.h"
 #include "crypto_ed25519.h"
 #include "crypto_format.h"

diff --git a/src/common/crypto_format.c b/src/common/crypto_format.c
index 1d090a8770de069c1f4c9ed92e209c980a8b98fb..3f6fb9f54c006194c9316c86b203b037038af1a7 100644 (file)
--- a/src/common/crypto_format.c
+++ b/src/common/crypto_format.c
@@ -19,6 +19,7 @@
 #include "crypto_curve25519.h"
 #include "crypto_ed25519.h"
 #include "crypto_format.h"
+#include "crypto_digest.h"
 #include "util.h"
 #include "util_format.h"
 #include "torlog.h"

diff --git a/src/common/crypto_pwbox.c b/src/common/crypto_pwbox.c
index 12acc9331c5bc12066be931b42522cede7ae00cd..604fc68e970b961acdbda147facc6fab460049dd 100644 (file)
--- a/src/common/crypto_pwbox.c
+++ b/src/common/crypto_pwbox.c
@@ -11,6 +11,7 @@
 #include "crypto.h"
 #include "crypto_s2k.h"
 #include "crypto_pwbox.h"
+#include "crypto_digest.h"
 #include "di_ops.h"
 #include "util.h"
 #include "pwbox.h"

diff --git a/src/common/crypto_rsa.c b/src/common/crypto_rsa.c
index 92b5978eafa2ad2863b3546e97c167846dfaf66f..2090b2e65f973ece8974ca8267d5277108e239f3 100644 (file)
--- a/src/common/crypto_rsa.c
+++ b/src/common/crypto_rsa.c
@@ -15,6 +15,7 @@
 #include "crypto_curve25519.h"
 #include "crypto_ed25519.h"
 #include "crypto_format.h"
+#include "crypto_digest.h"
 
 DISABLE_GCC_WARNING(redundant-decls)
 

diff --git a/src/common/crypto_s2k.c b/src/common/crypto_s2k.c
index b2fcca54c4da95afb079196745951597160f2cd4..316445e40ffcc51c2529865fea95694bc3b7cf0e 100644 (file)
--- a/src/common/crypto_s2k.c
+++ b/src/common/crypto_s2k.c
@@ -16,6 +16,7 @@
 #include "util.h"
 #include "compat.h"
 #include "crypto_s2k.h"
+#include "crypto_digest.h"
 
 #include <openssl/evp.h>
 

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 86a876780aee6aefb3de21f1f216bd0539aa15e7..777bdda16741f9ae2fca980b988818705a827b53 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -25,6 +25,7 @@
   #include <ws2tcpip.h>
 #endif
 
+#include "crypto.h"
 #include "compat.h"
 
 /* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in
@@ -32,7 +33,6 @@
 DISABLE_GCC_WARNING(redundant-decls)
 
 #include <openssl/opensslv.h>
-#include "crypto.h"
 
 #ifdef OPENSSL_NO_EC
 #error "We require OpenSSL with ECC support"

diff --git a/src/common/tortls.h b/src/common/tortls.h
index 1dbf0b332faa2c17ee2bc9173c71e79a1eab2b44..161b8e73a1067ad3ab275d06d91911dbbfb3c922 100644 (file)
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -11,7 +11,7 @@
  * \brief Headers for tortls.c
  **/
 
-#include "crypto.h"
+#include "crypto_digest.h"
 #include "compat_openssl.h"
 #include "compat.h"
 #include "testsupport.h"

diff --git a/src/common/util.c b/src/common/util.c
index 67e97811c64c2cb512533ee96f43a804b7c611ad..36b413dc82d4efb1f3ca013e8e44ef68f8407a65 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -16,7 +16,7 @@
 #define UTIL_PRIVATE
 #include "util.h"
 #include "torlog.h"
-#include "crypto.h"
+#include "crypto_digest.h"
 #include "torint.h"
 #include "container.h"
 #include "address.h"

diff --git a/src/ext/ed25519/donna/ed25519-hash-custom.h b/src/ext/ed25519/donna/ed25519-hash-custom.h
index 609451abd55c720e1db9a95c85f08c5a00594515..cdeab3e45b8388130c9c8a1744b57d9423926694 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 "crypto.h"
+#include "crypto_digest.h"
 
 typedef struct ed25519_hash_context {
   crypto_digest_t *ctx;

diff --git a/src/ext/ed25519/ref10/crypto_hash_sha512.h b/src/ext/ed25519/ref10/crypto_hash_sha512.h
index 5dad935c79a5783392b52002029caf32fe4472c8..7faddb1597878290924f11009024111f9764c1ab 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 "crypto.h"
+#include "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/or/keypin.c b/src/or/keypin.c
index 1698dc184f43f18ac79d1f843f361ea6662fafe9..457f21696fd23619a411514b2dd4db3d1f04d33e 100644 (file)
--- a/src/or/keypin.c
+++ b/src/or/keypin.c
@@ -12,7 +12,7 @@
 
 #include "orconfig.h"
 #include "compat.h"
-#include "crypto.h"
+#include "crypto_digest.h"
 #include "crypto_format.h"
 #include "di_ops.h"
 #include "ht.h"

diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c
index b167cb61fb094058f3cd3acd978ab2cb1b081860..8ad876a58772438bc256c5b0d76760131ec2e458 100644 (file)
--- a/src/or/onion_ntor.c
+++ b/src/or/onion_ntor.c
@@ -22,6 +22,7 @@
 
 #define ONION_NTOR_PRIVATE
 #include "crypto.h"
+#include "crypto_digest.h"
 #include "onion_ntor.h"
 #include "torlog.h"
 #include "util.h"

diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index fb7465c0eb8df741a15ce6ed5a13acf214a488d6..0d329b5183de78fa5c9d60a91d5cdc25bfcaefdb 100644 (file)
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -40,6 +40,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "util.h"
 #include "torlog.h"
 #include "crypto.h"
+#include "crypto_digest.h"
 #include "address.h"
 #include "util_format.h"