From 809f6fae848f53d2096bef1b2e99bcc929872e2a Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@torproject.org>
Date: Fri, 6 Apr 2018 22:04:50 +0000
Subject: [PATCH] refactor: Remove unnecessary `#include "crypto.h"` throughout
 codebase.

 * FIXES part of #24658: https://bugs.torproject.org/24658
---
 src/common/aes.c                    | 1 -
 src/common/crypto_curve25519.c      | 1 -
 src/common/crypto_ed25519.c         | 1 -
 src/common/crypto_format.c          | 1 -
 src/ext/ed25519/ref10/randombytes.h | 2 +-
 src/or/hs_cache.h                   | 1 -
 src/or/hs_circuit.h                 | 1 -
 src/or/hs_ident.h                   | 1 -
 src/test/test_dir_common.c          | 1 -
 9 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/common/aes.c b/src/common/aes.c
index 5d0841dfa3..6033bbe1fc 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -17,7 +17,6 @@
 #endif
 
 #include <openssl/opensslv.h>
-#include "crypto.h"
 #include "crypto_openssl_mgt.h"
 
 #if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0)
diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c
index becd706695..996d94c6e2 100644
--- a/src/common/crypto_curve25519.c
+++ b/src/common/crypto_curve25519.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #endif
 #include "container.h"
-#include "crypto.h"
 #include "crypto_curve25519.h"
 #include "crypto_digest.h"
 #include "crypto_format.h"
diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c
index 25e0cd0341..9c13e3bdf0 100644
--- a/src/common/crypto_ed25519.c
+++ b/src/common/crypto_ed25519.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #endif
 
-#include "crypto.h"
 #include "crypto_curve25519.h"
 #include "crypto_digest.h"
 #include "crypto_ed25519.h"
diff --git a/src/common/crypto_format.c b/src/common/crypto_format.c
index a76203207a..460e85bac1 100644
--- a/src/common/crypto_format.c
+++ b/src/common/crypto_format.c
@@ -15,7 +15,6 @@
 #include <sys/stat.h>
 #endif
 #include "container.h"
-#include "crypto.h"
 #include "crypto_curve25519.h"
 #include "crypto_digest.h"
 #include "crypto_ed25519.h"
diff --git a/src/ext/ed25519/ref10/randombytes.h b/src/ext/ed25519/ref10/randombytes.h
index 8bf31631f0..a21dde8540 100644
--- a/src/ext/ed25519/ref10/randombytes.h
+++ b/src/ext/ed25519/ref10/randombytes.h
@@ -1,4 +1,4 @@
 /* Added for Tor. */
-#include "crypto.h"
+#include "crypto_rand.h"
 #define randombytes(b, n) \
   (crypto_strongest_rand((b), (n)), 0)
diff --git a/src/or/hs_cache.h b/src/or/hs_cache.h
index a141634cc4..0d0085ffdc 100644
--- a/src/or/hs_cache.h
+++ b/src/or/hs_cache.h
@@ -11,7 +11,6 @@
 
 #include <stdint.h>
 
-#include "crypto.h"
 #include "crypto_ed25519.h"
 #include "hs_common.h"
 #include "hs_descriptor.h"
diff --git a/src/or/hs_circuit.h b/src/or/hs_circuit.h
index 2f5beaa168..f69137e1d5 100644
--- a/src/or/hs_circuit.h
+++ b/src/or/hs_circuit.h
@@ -10,7 +10,6 @@
 #define TOR_HS_CIRCUIT_H
 
 #include "or.h"
-#include "crypto.h"
 #include "crypto_ed25519.h"
 
 #include "hs_service.h"
diff --git a/src/or/hs_ident.h b/src/or/hs_ident.h
index 91ec389aa4..8f9da30c35 100644
--- a/src/or/hs_ident.h
+++ b/src/or/hs_ident.h
@@ -21,7 +21,6 @@
 #ifndef TOR_HS_IDENT_H
 #define TOR_HS_IDENT_H
 
-#include "crypto.h"
 #include "crypto_ed25519.h"
 
 #include "hs_common.h"
diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c
index fdf43533a8..a353ddb794 100644
--- a/src/test/test_dir_common.c
+++ b/src/test/test_dir_common.c
@@ -5,7 +5,6 @@
 
 #include "orconfig.h"
 #define DIRVOTE_PRIVATE
-#include "crypto.h"
 #include "test.h"
 #include "container.h"
 #include "or.h"