From: Rosen Penev Date: Wed, 12 Dec 2018 21:40:37 +0000 (-0800) Subject: Fix compilation when OpenSSL has no ENGINE support X-Git-Tag: release-1.0.36~8 X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=4701ce8f18a7785c49848e434b6e26aac89c2942;p=tinc Fix compilation when OpenSSL has no ENGINE support This will be the case in OpenWrt soon. --- diff --git a/src/tincd.c b/src/tincd.c index 7b882c7a..bdac0c9d 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -37,7 +37,9 @@ #include #include #include +#ifndef OPENSSL_NO_ENGINE #include +#endif #ifdef HAVE_LZO #include LZO1X_H @@ -685,8 +687,10 @@ int main(int argc, char **argv) { init_configuration(&config_tree); +#ifndef OPENSSL_NO_ENGINE ENGINE_load_builtin_engines(); ENGINE_register_all_complete(); +#endif OpenSSL_add_all_algorithms(); @@ -809,7 +813,9 @@ end: EVP_cleanup(); ERR_free_strings(); +#ifndef OPENSSL_NO_ENGINE ENGINE_cleanup(); +#endif exit_configuration(&config_tree); list_delete_list(cmdline_conf);