]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Add crypto_openssl_mgt.[ch] for compiling dependencies.
authorFernando Fernandez Mancera <ffernandezmancera@gmail.com>
Fri, 19 Jan 2018 17:56:13 +0000 (18:56 +0100)
committerFernando Fernandez Mancera <ffernandezmancera@gmail.com>
Fri, 19 Jan 2018 17:56:13 +0000 (18:56 +0100)
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@gmail.com>
src/common/aes.c
src/common/compat_openssl.h
src/common/crypto_curve25519.h
src/common/include.am

index 20b51a67586e6c69d2f9b17ce14ac5e507a81abb..20c1f758f9fd9905fc012595bedf7bbcf93183e2 100644 (file)
@@ -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"
index c695f1e9df10a2657ff0b78515cb1bf554b65014..d1b871b0f1530644e2bc54be69a0a047f150e37e 100644 (file)
@@ -8,7 +8,7 @@
 #define TOR_COMPAT_OPENSSL_H
 
 #include <openssl/opensslv.h>
-
+#include "crypto_openssl_mgt.h"
 /**
  * \file compat_openssl.h
  *
index d024ab79f530110ebc750f492706de1c7b281bed..11f7423b075ba8737703cc6b9a5005041892e4c9 100644 (file)
@@ -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
index cd5eea34043f5ab65c85c3f50113c3c6f0132228..944dc028bde9ba65c2c43553f9136e2edfa6e265 100644 (file)
@@ -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                          \