Commit 61c7ec29 authored by Fernando Fernandez Mancera's avatar Fernando Fernandez Mancera
Browse files

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: default avatarFernando Fernandez Mancera <ffmancera@riseup.net>
parent 202d27af
......@@ -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>
......
......@@ -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)
......
......@@ -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"
......
......@@ -23,6 +23,7 @@
#include "crypto.h"
#include "crypto_digest.h"
#include "crypto_curve25519.h"
#include "crypto_ed25519.h"
#include "crypto_format.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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)
......
......@@ -16,6 +16,7 @@
#include "util.h"
#include "compat.h"
#include "crypto_s2k.h"
#include "crypto_digest.h"
#include <openssl/evp.h>
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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;
......
/* 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) \
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment