Fix compilation without deprecated OpenSSL 1.1 APIs

Initialization and deinitialization is deprecated.

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

diff --git a/library.c b/library.c
index 0e3d05e6d3ecbbbb8665363356000c118b30a8da..e45e93a2d6b4c21b1e19032454be5f4ae7b14844 100644 (file)
--- a/library.c
+++ b/library.c
@@ -38,6 +38,10 @@
 #include "gnutls.h"
 #endif
 
+#if defined(OPENCONNECT_OPENSSL)
+#include <openssl/bio.h>
+#endif
+
 struct openconnect_info *openconnect_vpninfo_new(const char *useragent,
                                                 openconnect_validate_peer_cert_vfn validate_peer_cert,
                                                 openconnect_write_new_config_vfn write_new_config,

diff --git a/openssl.c b/openssl.c
index 2b1f07bdec384d213de916a935bfe843e7118957..e505f49a29ff6d39eca9180abf9af22b9ed22bdf 100644 (file)
--- a/openssl.c
+++ b/openssl.c
@@ -1879,10 +1879,12 @@ int openconnect_init_ssl(void)
        if (ret)
                return ret;
 #endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
        SSL_library_init();
        ERR_clear_error();
        SSL_load_error_strings();
        OpenSSL_add_all_algorithms();
+#endif
        return 0;
 }
 

diff --git a/tests/bad_dtls_test.c b/tests/bad_dtls_test.c
index ac8d3f1e09bbc5f9cf4c77b510cdfb201b9ad84f..c123c8f8c7bd1ee735b630b10b79098a09eda571 100644 (file)
--- a/tests/bad_dtls_test.c
+++ b/tests/bad_dtls_test.c
@@ -752,8 +752,10 @@ int main(int argc, char *argv[])
     int ret;
     int i;
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
     SSL_library_init();
     SSL_load_error_strings();
+#endif
 
     RAND_bytes(session_id, sizeof(session_id));
     RAND_bytes(master_secret, sizeof(master_secret));
@@ -910,8 +912,10 @@ int main(int argc, char *argv[])
         printf("Cisco BadDTLS test: FAILED\n");
     }
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
     ERR_free_strings();
     EVP_cleanup();
+#endif
 
     return testresult?0:1;
 }