commit 3e9140e79a063ca7a8539a0d58e6d379be775ff3 Author: Isis Lovecruft isis@torproject.org Date: Tue Feb 20 19:42:02 2018 +0000

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 --- src/common/crypto_curve25519.h | 1 + src/common/crypto_digest.c | 1 + src/common/crypto_digest.h | 3 ++- src/test/test_hs_descriptor.c | 1 + 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/common/crypto_curve25519.h b/src/common/crypto_curve25519.h index 11f7423b0..4834fa083 100644 --- 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 36027cbe1..3f7884b12 100644 --- 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 17daac9c3..f8cd44a03 100644 --- 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 9ec183db0..9be1bc706 100644 --- 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"