From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 2 Apr 2021 21:36:39 +0000 (-0700)
Subject: fix compilation without deprecated OpenSSL APIs
X-Git-Tag: release-1.1pre18~18
X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=f12e34dd921ce0df138194d6559aacf18da0e192

fix compilation without deprecated OpenSSL APIs

This was fixed for 1.0 but missing for 1.1.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index 072bf7ab..86aca412 100644
--- a/src/openssl/crypto.c
+++ b/src/openssl/crypto.c
@@ -96,9 +96,10 @@ void crypto_init(void) {
 
 	ENGINE_load_builtin_engines();
 	ENGINE_register_all_complete();
-
+#if OPENSSL_API_COMPAT < 0x10100000L
 	ERR_load_crypto_strings();
 	OpenSSL_add_all_algorithms();
+#endif
 
 	if(!RAND_status()) {
 		fprintf(stderr, "Not enough entropy for the PRNG!\n");
@@ -107,8 +108,10 @@ void crypto_init(void) {
 }
 
 void crypto_exit(void) {
+#if OPENSSL_API_COMPAT < 0x10100000L
 	EVP_cleanup();
 	ERR_free_strings();
 	ENGINE_cleanup();
+#endif
 	random_exit();
 }
diff --git a/src/openssl/rsa.c b/src/openssl/rsa.c
index 0e811722..48a71a91 100644
--- a/src/openssl/rsa.c
+++ b/src/openssl/rsa.c
@@ -21,6 +21,7 @@
 
 #include <openssl/pem.h>
 #include <openssl/err.h>
+#include <openssl/rsa.h>
 
 #define TINC_RSA_INTERNAL
 typedef RSA rsa_t;