crypto: Remove unnecessary curve25519 header from crypto_digest.h.

 * ADD includes for "torint.h" and "container.h" to crypto_digest.h.
 * ADD includes for "crypto_digest.h" to a couple places in which
   crypto_digest_t was then missing.
 * FIXES part of #24658: https://bugs.torproject.org/24658#comment:30

diff --git a/src/common/crypto_curve25519.h b/src/common/crypto_curve25519.h
index 11f7423b075ba8737703cc6b9a5005041892e4c9..4834fa08363b63c019e1095f716351290b74276a 100644 (file)
--- a/src/common/crypto_curve25519.h
+++ b/src/common/crypto_curve25519.h
@@ -6,6 +6,7 @@
 
 #include "testsupport.h"
 #include "torint.h"
+#include "crypto_digest.h"
 #include "crypto_openssl_mgt.h"
 
 /** Length of a curve25519 public key when encoded. */

diff --git a/src/common/crypto_digest.c b/src/common/crypto_digest.c
index 36027cbe1d257d64d6ebcc496c7f2adc37fd2408..3f7884b12ee18508ed4c334c23c4f77c0540a7d9 100644 (file)
--- a/src/common/crypto_digest.c
+++ b/src/common/crypto_digest.c
@@ -18,6 +18,7 @@
 DISABLE_GCC_WARNING(redundant-decls)
 
 #include <openssl/hmac.h>
+#include <openssl/sha.h>
 
 ENABLE_GCC_WARNING(redundant-decls)
 

diff --git a/src/common/crypto_digest.h b/src/common/crypto_digest.h
index 17daac9c35a7cb5b783e2b03188b8724ba60134f..f8cd44a0356502f608377ca3e6f14ca3a229b8f6 100644 (file)
--- a/src/common/crypto_digest.h
+++ b/src/common/crypto_digest.h
@@ -15,7 +15,8 @@
 
 #include <stdio.h>
 
-#include "crypto_curve25519.h"
+#include "container.h"
+#include "torint.h"
 
 /** Length of the output of our message digest. */
 #define DIGEST_LEN 20

diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c
index 9ec183db06bacfa735c57a2b8b5c4fc538f4329f..9be1bc706b557c4de6e5c99bb2fe1af698b1a87c 100644 (file)
--- a/src/test/test_hs_descriptor.c
+++ b/src/test/test_hs_descriptor.c
@@ -9,6 +9,7 @@
 #define HS_DESCRIPTOR_PRIVATE
 
 #include "crypto_ed25519.h"
+#include "crypto_digest.h"
 #include "ed25519_cert.h"
 #include "or.h"
 #include "hs_descriptor.h"