Fix compilation when OpenSSL has no ENGINE support
authorRosen Penev <rosenp@gmail.com>
Wed, 12 Dec 2018 21:40:37 +0000 (13:40 -0800)
committerGuus Sliepen <guus@tinc-vpn.org>
Tue, 18 Dec 2018 15:50:26 +0000 (16:50 +0100)
This will be the case in OpenWrt soon.

src/tincd.c

index 7b882c7aeaa8beae25cccdde0b183bfa0fc11925..bdac0c9d8451f1f3cac3d2103e8778d49dd1cdad 100644 (file)
@@ -37,7 +37,9 @@
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#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);