tvheadend: Fix compilation without OpenSSL deprecated APIs

Also switched to codeload for Makefile simplicity.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 5033e594cc)
This commit is contained in:
Rosen Penev
2018-11-19 14:48:02 -08:00
parent 59f7eb5e1f
commit bd96e95e3f
2 changed files with 39 additions and 8 deletions
@@ -0,0 +1,35 @@
--- a/src/main.c
+++ b/src/main.c
@@ -965,10 +965,12 @@ main(int argc, char **argv)
sigprocmask(SIG_BLOCK, &set, NULL);
trap_init(argv[0]);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
/* SSL library init */
OPENSSL_config(NULL);
SSL_load_error_strings();
SSL_library_init();
+#endif
/* Initialise configuration */
notify_init();
@@ -1159,8 +1161,11 @@ main(int argc, char **argv)
#endif
free(opt_satip_xml.str);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
/* OpenSSL - welcome to the "cleanup" hell */
+#ifndef OPENSSL_NO_ENGINE
ENGINE_cleanup();
+#endif
RAND_cleanup();
CRYPTO_cleanup_all_ex_data();
EVP_cleanup();
@@ -1174,6 +1179,7 @@ main(int argc, char **argv)
sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
#endif
/* end of OpenSSL cleanup code */
+#endif
#if ENABLE_DBUS_1
extern void dbus_shutdown(void);