[tor-commits] [tor/master] Add crypto_openssl_mgt.[ch] for compiling dependencies.

[nickm at torproject.org]

commit 5cd74b4884d35b43e464a3dcc6125f7ca2a3b0e3
Author: Fernando Fernandez Mancera <ffernandezmancera at gmail.com>
Date:   Fri Jan 19 18:56:13 2018 +0100

    Add crypto_openssl_mgt.[ch] for compiling dependencies.
    
    Included crypto_openssl_mgt.[ch] into the appropiate files in order to resolve
    compiling and dependencies issues.
    
    Follows #24658.
    
    Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera at gmail.com>
---
 src/common/aes.c               | 1 +
 src/common/compat_openssl.h    | 2 +-
 src/common/crypto_curve25519.h | 1 +
 src/common/include.am          | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/common/aes.c b/src/common/aes.c
index 20b51a675..20c1f758f 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -18,6 +18,7 @@
 
 #include <openssl/opensslv.h>
 #include "crypto.h"
+#include "crypto_openssl_mgt.h"
 
 #if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0)
 #error "We require OpenSSL >= 1.0.0"
diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h
index c695f1e9d..d1b871b0f 100644
--- a/src/common/compat_openssl.h
+++ b/src/common/compat_openssl.h
@@ -8,7 +8,7 @@
 #define TOR_COMPAT_OPENSSL_H
 
 #include <openssl/opensslv.h>
-
+#include "crypto_openssl_mgt.h"
 /**
  * \file compat_openssl.h
  *
diff --git a/src/common/crypto_curve25519.h b/src/common/crypto_curve25519.h
index d024ab79f..11f7423b0 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_openssl_mgt.h"
 
 /** Length of a curve25519 public key when encoded. */
 #define CURVE25519_PUBKEY_LEN 32
diff --git a/src/common/include.am b/src/common/include.am
index cd5eea340..944dc028b 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -118,6 +118,7 @@ LIBOR_CRYPTO_A_SRC = \
   src/common/compress_zlib.c	\
   src/common/compress_zstd.c	\
   src/common/crypto.c		\
+  src/common/crypto_openssl_mgt.c    \
   src/common/crypto_pwbox.c     \
   src/common/crypto_s2k.c	\
   src/common/crypto_format.c	\
@@ -170,6 +171,7 @@ COMMONHEADERS = \
   src/common/crypto_curve25519.h		\
   src/common/crypto_ed25519.h			\
   src/common/crypto_format.h			\
+  src/common/crypto_openssl_mgt.h         \
   src/common/crypto_pwbox.h			\
   src/common/crypto_s2k.h			\
   src/common/di_ops.h				\