Fix compilation without deprecated OpenSSL APIs

This is an optional part of OpenWrt designed to save space.

diff --git a/src/connection.c b/src/connection.c
index 38b3ccfe1b91c675fd5e7783b89474a5c2778c67..d137af12f796142d3eeee267cdc5016e82cb6b84 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -96,13 +96,13 @@ void free_connection_partially(connection_t *c) {
        c->outbudget = 0;
 
        if(c->inctx) {
-               EVP_CIPHER_CTX_cleanup(c->inctx);
+               EVP_CIPHER_CTX_reset(c->inctx);
                free(c->inctx);
                c->inctx = NULL;
        }
 
        if(c->outctx) {
-               EVP_CIPHER_CTX_cleanup(c->outctx);
+               EVP_CIPHER_CTX_reset(c->outctx);
                free(c->outctx);
                c->outctx = NULL;
        }

diff --git a/src/connection.h b/src/connection.h
index 629e16b9cc1bc555db64ce91a2abede82865f24c..4f554672d23ce96b8c6f8541d046de41abc8e3f8 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -24,6 +24,10 @@
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define EVP_CIPHER_CTX_reset(c)        EVP_CIPHER_CTX_cleanup(c)
+#endif
+
 #include "avl_tree.h"
 
 #define OPTION_INDIRECT         0x0001

diff --git a/src/net_setup.c b/src/net_setup.c
index cac7455d3a16f44add273ac4d41d2cc53963e0f8..f26007bda07ff27d248f98166f0133fce2a2e8e3 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -27,6 +27,7 @@
 #include <openssl/rand.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 
 #include "avl_tree.h"
 #include "conf.h"

diff --git a/src/tincd.c b/src/tincd.c
index bdac0c9d8451f1f3cac3d2103e8778d49dd1cdad..e8a60449aa8412ced9ff62ce39c49979dc8aee13 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -40,6 +40,7 @@
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
+#include <openssl/bn.h>
 
 #ifdef HAVE_LZO
 #include LZO1X_H
@@ -692,7 +693,9 @@ int main(int argc, char **argv) {
        ENGINE_register_all_complete();
 #endif
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
        OpenSSL_add_all_algorithms();
+#endif
 
        if(generate_keys) {
                read_server_config();
@@ -811,10 +814,12 @@ end:
 
        free(priority);
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
        EVP_cleanup();
        ERR_free_strings();
 #ifndef OPENSSL_NO_ENGINE
        ENGINE_cleanup();
+#endif
 #endif
 
        exit_configuration(&config_tree);