diff options
| author | Isis Lovecruft <isis@torproject.org> | 2018-02-20 19:42:02 +0000 |
|---|---|---|
| committer | Isis Lovecruft <isis@torproject.org> | 2018-02-20 20:29:54 +0000 |
| commit | 3e9140e79a063ca7a8539a0d58e6d379be775ff3 (patch) | |
| tree | 13c5563fdfb31884b90353c61b0166244b84eec0 /src | |
| parent | 0fad49e1c495414cb80994863b616005724da51f (diff) | |
| download | tor-3e9140e79a063ca7a8539a0d58e6d379be775ff3.tar.gz tor-3e9140e79a063ca7a8539a0d58e6d379be775ff3.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/crypto_curve25519.h | 1 | ||||
| -rw-r--r-- | src/common/crypto_digest.c | 1 | ||||
| -rw-r--r-- | src/common/crypto_digest.h | 3 | ||||
| -rw-r--r-- | src/test/test_hs_descriptor.c | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/src/common/crypto_curve25519.h b/src/common/crypto_curve25519.h index 11f7423b07..4834fa0836 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 36027cbe1d..3f7884b12e 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 17daac9c35..f8cd44a035 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 9ec183db06..9be1bc706b 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" |