aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Fernandez Mancera <ffmancera@riseup.net>2018-05-08 15:56:04 +0200
committerFernando Fernandez Mancera <ffmancera@riseup.net>2018-05-08 15:57:31 +0200
commitffbf8673b55e0f05bd27e9aa34f45f758941f446 (patch)
tree9984dbbb4dddfa02d92e201cb449352a3e94bf95
parentf91469c16555836f91691be8adc9c29bb33dfc3f (diff)
downloadtor-ffbf8673b55e0f05bd27e9aa34f45f758941f446.tar.gz
tor-ffbf8673b55e0f05bd27e9aa34f45f758941f446.zip
Include crypto_dh.h in order to solve dependency issues.
Included crypto_dh.h in some files in order to solve DH module dependency issues. Follows #24658. Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
-rw-r--r--src/common/crypto_s2k.c1
-rw-r--r--src/common/include.am2
-rw-r--r--src/common/tortls.c1
-rw-r--r--src/or/onion_ntor.c1
-rw-r--r--src/or/or.h1
5 files changed, 6 insertions, 0 deletions
diff --git a/src/common/crypto_s2k.c b/src/common/crypto_s2k.c
index 8543760ec5..47cb62d076 100644
--- a/src/common/crypto_s2k.c
+++ b/src/common/crypto_s2k.c
@@ -15,6 +15,7 @@
#include "compat.h"
#include "crypto.h"
#include "crypto_digest.h"
+#include "crypto_dh.h"
#include "crypto_rand.h"
#include "crypto_s2k.h"
#include "crypto_util.h"
diff --git a/src/common/include.am b/src/common/include.am
index bce3fa20f6..6dafcea206 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -115,6 +115,7 @@ LIBOR_CRYPTO_A_SRC = \
src/common/compress_zlib.c \
src/common/compress_zstd.c \
src/common/crypto.c \
+ src/common/crypto_dh.c \
src/common/crypto_digest.c \
src/common/crypto_format.c \
src/common/crypto_openssl_mgt.c \
@@ -169,6 +170,7 @@ COMMONHEADERS = \
src/common/confline.h \
src/common/container.h \
src/common/crypto.h \
+ src/common/crypto_dh.h \
src/common/crypto_digest.h \
src/common/crypto_curve25519.h \
src/common/crypto_ed25519.h \
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 10b0319bec..a85124df2f 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -27,6 +27,7 @@
#include "crypto.h"
#include "crypto_rand.h"
+#include "crypto_dh.h"
#include "crypto_util.h"
#include "compat.h"
diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c
index 02d43cb722..74403ac7ae 100644
--- a/src/or/onion_ntor.c
+++ b/src/or/onion_ntor.c
@@ -22,6 +22,7 @@
#define ONION_NTOR_PRIVATE
#include "crypto.h"
+#include "crypto_dh.h"
#include "crypto_digest.h"
#include "crypto_util.h"
#include "onion_ntor.h"
diff --git a/src/or/or.h b/src/or/or.h
index cd77b21056..e64ad1d4b7 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -68,6 +68,7 @@
#include "crypto.h"
#include "crypto_format.h"
+#include "crypto_dh.h"
#include "tortls.h"
#include "torlog.h"
#include "container.h"