From d86a68f510924d9afc4eec6970c68597783d245d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Wed, 28 Dec 2016 12:40:47 +0100 Subject: Add support for OpenSSL 1.1.0 --- zyklonb.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'zyklonb.c') 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); -- cgit v1.2.3