[tor-commits] [tor/master] Include crypto_dh.h in order to solve dependency issues.

[nickm at torproject.org]

commit ffbf8673b55e0f05bd27e9aa34f45f758941f446
Author: Fernando Fernandez Mancera <ffmancera at riseup.net>
Date:   Tue May 8 15:56:04 2018 +0200

    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 at riseup.net>
---
 src/common/crypto_s2k.c | 1 +
 src/common/include.am   | 2 ++
 src/common/tortls.c     | 1 +
 src/or/onion_ntor.c     | 1 +
 src/or/or.h             | 1 +
 5 files changed, 6 insertions(+)

diff --git a/src/common/crypto_s2k.c b/src/common/crypto_s2k.c
index 8543760ec..47cb62d07 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 bce3fa20f..6dafcea20 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 10b0319be..a85124df2 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 02d43cb72..74403ac7a 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 cd77b2105..e64ad1d4b 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"