nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add crypto_openssl_mgt.[ch] for compiling dependencies.

Browse Source 
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>
This commit is contained in:
Fernando Fernandez Mancera 2018-01-19 18:56:13 +01:00
parent b3aa7be26c
commit 5cd74b4884
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/aes.c
View File

@ -18,6 +18,7 @@
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#include "crypto.h" #include "crypto.h"
#include "crypto_openssl_mgt.h"
#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0) #if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0)
#error "We require OpenSSL >= 1.0.0" #error "We require OpenSSL >= 1.0.0"

2
src/common/compat_openssl.h
View File

@ -8,7 +8,7 @@
#define TOR_COMPAT_OPENSSL_H #define TOR_COMPAT_OPENSSL_H
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#include "crypto_openssl_mgt.h"
/** /**
* \file compat_openssl.h * \file compat_openssl.h
* *

1
src/common/crypto_curve25519.h
View File

@ -6,6 +6,7 @@
#include "testsupport.h" #include "testsupport.h"
#include "torint.h" #include "torint.h"
#include "crypto_openssl_mgt.h"
/** Length of a curve25519 public key when encoded. */ /** Length of a curve25519 public key when encoded. */
#define CURVE25519_PUBKEY_LEN 32 #define CURVE25519_PUBKEY_LEN 32

2
src/common/include.am
View File

@ -118,6 +118,7 @@ LIBOR_CRYPTO_A_SRC = \
src/common/compress_zlib.c \ src/common/compress_zlib.c \
src/common/compress_zstd.c \ src/common/compress_zstd.c \
src/common/crypto.c \ src/common/crypto.c \
src/common/crypto_openssl_mgt.c \
src/common/crypto_pwbox.c \ src/common/crypto_pwbox.c \
src/common/crypto_s2k.c \ src/common/crypto_s2k.c \
src/common/crypto_format.c \ src/common/crypto_format.c \
@ -170,6 +171,7 @@ COMMONHEADERS = \
src/common/crypto_curve25519.h \ src/common/crypto_curve25519.h \
src/common/crypto_ed25519.h \ src/common/crypto_ed25519.h \
src/common/crypto_format.h \ src/common/crypto_format.h \
src/common/crypto_openssl_mgt.h \
src/common/crypto_pwbox.h \ src/common/crypto_pwbox.h \
src/common/crypto_s2k.h \ src/common/crypto_s2k.h \
src/common/di_ops.h \ src/common/di_ops.h \