瀏覽代碼

Add more openssl includes to fix no-deprecated compilation

Closes ticket 29026; patch from Mangix.
Nick Mathewson 6 年之前
父節點
當前提交
49ec29044d
共有 4 個文件被更改,包括 9 次插入0 次删除
  1. 1 0
      src/lib/crypt_ops/crypto_hkdf.c
  2. 1 0
      src/lib/crypt_ops/crypto_rand.c
  3. 4 0
      src/lib/crypt_ops/crypto_rsa.c
  4. 3 0
      src/lib/tls/x509_openssl.c

+ 1 - 0
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)

+ 1 - 0
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
 

+ 4 - 0
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

+ 3 - 0
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)