commit 49ec29044d12ff1d609ebe491f08f84e958be748 Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 8 08:51:04 2019 -0500

Add more openssl includes to fix no-deprecated compilation

Closes ticket 29026; patch from Mangix. --- src/lib/crypt_ops/crypto_hkdf.c | 1 + src/lib/crypt_ops/crypto_rand.c | 1 + src/lib/crypt_ops/crypto_rsa.c | 4 ++++ src/lib/tls/x509_openssl.c | 3 +++ 4 files changed, 9 insertions(+)

diff --git a/src/lib/crypt_ops/crypto_hkdf.c b/src/lib/crypt_ops/crypto_hkdf.c index 6c82fa14f..fd2e70165 100644 --- a/src/lib/crypt_ops/crypto_hkdf.c +++ b/src/lib/crypt_ops/crypto_hkdf.c @@ -18,6 +18,7 @@ #include "lib/log/util_bug.h"

#ifdef ENABLE_OPENSSL +#include <openssl/evp.h> #include <openssl/opensslv.h>

#if defined(HAVE_ERR_LOAD_KDF_STRINGS) diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 70b2965ca..915fe0870 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -45,6 +45,7 @@ #ifdef ENABLE_OPENSSL DISABLE_GCC_WARNING(redundant-decls) #include <openssl/rand.h> +#include <openssl/sha.h> ENABLE_GCC_WARNING(redundant-decls) #endif

diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 2b977b0b9..c9189b0df 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -31,6 +31,10 @@ #include <sys/stat.h> #endif

+#ifdef ENABLE_OPENSSL +#include <openssl/rsa.h> +#endif + /** Return the number of bytes added by padding method <b>padding</b>. */ int diff --git a/src/lib/tls/x509_openssl.c b/src/lib/tls/x509_openssl.c index cf276c424..a344279c2 100644 --- a/src/lib/tls/x509_openssl.c +++ b/src/lib/tls/x509_openssl.c @@ -31,7 +31,10 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/asn1.h> #include <openssl/bio.h> #include <openssl/bn.h> +#include <openssl/evp.h> +#include <openssl/objects.h> #include <openssl/rsa.h> +#include <openssl/x509.h>

ENABLE_GCC_WARNING(redundant-decls)