Add support for OpenSSL 1.1.0

4 files changed, 20 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 3f7b6af..a503464 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@
 
  * degesch: allow hiding join/part messages and other noise (Meta-Shift-H)
 
+ * degesch: make /query without arguments just open the buffer
+
  * degesch: add a censor plugin
 
  * degesch: die on configuration parse errors
@@ -16,6 +18,8 @@
 
  * degesch: fix CTCP handling for the real world and don't decode X-QUOTEs
 
+ * degesch: add support for OpenSSL 1.1.0
+
 
 0.9.4 (2016-04-28) "Oops"
 
diff --git a/degesch.c b/degesch.c
index 216ea0a..3263ae0 100644
--- a/degesch.c
+++ b/degesch.c
@@ -14009,10 +14009,15 @@ main (int argc, char *argv[])
 	app_context_init (&ctx);
 	g_ctx = &ctx;
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	SSL_library_init ();
 	atexit (EVP_cleanup);
 	SSL_load_error_strings ();
 	atexit (ERR_free_strings);
+#else
+	// Cleanup is done automatically via atexit()
+	OPENSSL_init_ssl (0, NULL);
+#endif
 
 	// Bootstrap configuration, so that we can access schema items at all
 	register_config_modules (&ctx);
diff --git a/kike.c b/kike.c
index affb4ed..da9bdc5 100644
--- a/kike.c
+++ b/kike.c
@@ -4044,10 +4044,15 @@ main (int argc, char *argv[])
 	print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting");
 	setup_signal_handlers ();
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	SSL_library_init ();
 	atexit (EVP_cleanup);
 	SSL_load_error_strings ();
 	atexit (ERR_free_strings);
+#else
+	// Cleanup is done automatically via atexit()
+	OPENSSL_init_ssl (0, NULL);
+#endif
 
 	struct server_context ctx;
 	server_context_init (&ctx);
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);