nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more openssl includes to fix no-deprecated compilation

Browse Source 
Closes ticket 29026; patch from Mangix.
This commit is contained in:
Nick Mathewson 2019-02-08 08:51:04 -05:00
parent b9abdcd6bc
commit 49ec29044d
4 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/crypt_ops/crypto_hkdf.c
View File

@ -18,6 +18,7 @@
#include "lib/log/util_bug.h" #include "lib/log/util_bug.h"
#ifdef ENABLE_OPENSSL #ifdef ENABLE_OPENSSL
#include <openssl/evp.h>
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#if defined(HAVE_ERR_LOAD_KDF_STRINGS) #if defined(HAVE_ERR_LOAD_KDF_STRINGS)

1
src/lib/crypt_ops/crypto_rand.c
View File

@ -45,6 +45,7 @@
#ifdef ENABLE_OPENSSL #ifdef ENABLE_OPENSSL
DISABLE_GCC_WARNING(redundant-decls) DISABLE_GCC_WARNING(redundant-decls)
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/sha.h>
ENABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls)
#endif #endif

4
src/lib/crypt_ops/crypto_rsa.c
View File

@ -31,6 +31,10 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#ifdef ENABLE_OPENSSL
#include <openssl/rsa.h>
#endif
/** Return the number of bytes added by padding method <b>padding</b>. /** Return the number of bytes added by padding method <b>padding</b>.
*/ */
int int

3
src/lib/tls/x509_openssl.c
View File

@ -31,7 +31,10 @@ DISABLE_GCC_WARNING(redundant-decls)
#include <openssl/asn1.h> #include <openssl/asn1.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/x509.h>
ENABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls)