aboutsummaryrefslogtreecommitdiff
path: root/zyklonb.c
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2016-12-28 12:40:47 +0100
committerPřemysl Janouch <p.janouch@gmail.com>2016-12-28 12:40:47 +0100
commitd86a68f510924d9afc4eec6970c68597783d245d (patch)
treebe7bc50c20cb096ed28034d486f9b19ff0ed33fb /zyklonb.c
parentd6be22291dca329ec1463132fe0fc314b1841b1c (diff)
downloadxK-d86a68f510924d9afc4eec6970c68597783d245d.tar.gz
xK-d86a68f510924d9afc4eec6970c68597783d245d.tar.xz
xK-d86a68f510924d9afc4eec6970c68597783d245d.zip
Add support for OpenSSL 1.1.0
Diffstat (limited to 'zyklonb.c')
-rw-r--r--zyklonb.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/zyklonb.c b/zyklonb.c
index 5f73105..3688a6a 100644
--- a/zyklonb.c
+++ b/zyklonb.c
@@ -2011,11 +2011,16 @@ main (int argc, char *argv[])
print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting");
setup_signal_handlers ();
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init ();
+ // XXX: this list is probably not complete
atexit (EVP_cleanup);
SSL_load_error_strings ();
- // XXX: ERR_load_BIO_strings()? Anything else?
atexit (ERR_free_strings);
+#else
+ // Cleanup is done automatically via atexit()
+ OPENSSL_init_ssl (0, NULL);
+#endif
struct bot_context ctx;
bot_context_init (&ctx);