From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 8 Feb 2019 13:51:04 +0000 (-0500)
Subject: Add more openssl includes to fix no-deprecated compilation
X-Git-Tag: tor-0.4.1.0-alpha-dev~4^2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49ec29044d12ff1d609ebe491f08f84e958be748;p=thirdparty%2Ftor.git

Add more openssl includes to fix no-deprecated compilation

Closes ticket 29026; patch from Mangix.
---

diff --git a/src/lib/crypt_ops/crypto_hkdf.c b/src/lib/crypt_ops/crypto_hkdf.c
index 6c82fa14f6..fd2e701651 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 70b2965ca4..915fe0870d 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 2b977b0b9b..c9189b0dfc 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 cf276c4240..a344279c22 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)