p/xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 11 Wiki Activity

Add support for OpenSSL 1.1.0

Browse Source
This commit is contained in:
Přemysl Eric Janouch
2016-12-28 12:40:47 +01:00
parent d6be22291d
commit d86a68f510
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -8,6 +8,8 @@
* degesch: allow hiding join/part messages and other noise (Meta-Shift-H) * 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: add a censor plugin
* degesch: die on configuration parse errors * 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: 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" 0.9.4 (2016-04-28) "Oops"

5
degesch.c
View File

@@ -14009,10 +14009,15 @@ main (int argc, char *argv[])
app_context_init (&ctx); app_context_init (&ctx);
g_ctx = &ctx; g_ctx = &ctx;
#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init (); SSL_library_init ();
atexit (EVP_cleanup); atexit (EVP_cleanup);
SSL_load_error_strings (); SSL_load_error_strings ();
atexit (ERR_free_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 // Bootstrap configuration, so that we can access schema items at all
register_config_modules (&ctx); register_config_modules (&ctx);

5
kike.c
View File

@@ -4044,10 +4044,15 @@ main (int argc, char *argv[])
print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting"); print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting");
setup_signal_handlers (); setup_signal_handlers ();
#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init (); SSL_library_init ();
atexit (EVP_cleanup); atexit (EVP_cleanup);
SSL_load_error_strings (); SSL_load_error_strings ();
atexit (ERR_free_strings); atexit (ERR_free_strings);
#else
// Cleanup is done automatically via atexit()
OPENSSL_init_ssl (0, NULL);
#endif
struct server_context ctx; struct server_context ctx;
server_context_init (&ctx); server_context_init (&ctx);

7
zyklonb.c
View File

@@ -2011,11 +2011,16 @@ main (int argc, char *argv[])
print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting"); print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting");
setup_signal_handlers (); setup_signal_handlers ();
#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init (); SSL_library_init ();
// XXX: this list is probably not complete
atexit (EVP_cleanup); atexit (EVP_cleanup);
SSL_load_error_strings (); SSL_load_error_strings ();
// XXX: ERR_load_BIO_strings()? Anything else?
atexit (ERR_free_strings); atexit (ERR_free_strings);
#else
// Cleanup is done automatically via atexit()
OPENSSL_init_ssl (0, NULL);
#endif
struct bot_context ctx; struct bot_context ctx;
bot_context_init (&ctx); bot_context_init (&ctx);