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

Cleanup

This commit is contained in:
Přemysl Eric Janouch 2016-12-28 12:44:27 +01:00
parent d86a68f510
commit eb70bf3fbc
Signed by: p
GPG Key ID: B715679E3A361BE6
4 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common.c
View File

@ -34,6 +34,21 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
static void
init_openssl (void)
{
#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init ();
// XXX: this list is probably not complete
atexit (EVP_cleanup);
SSL_load_error_strings ();
atexit (ERR_free_strings);
#else
// Cleanup is done automatically via atexit()
OPENSSL_init_ssl (0, NULL);
#endif
}
// --- To be moved to liberty -------------------------------------------------- // --- To be moved to liberty --------------------------------------------------
static ssize_t static ssize_t

10
degesch.c
View File

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

11
kike.c
View File

@ -4043,16 +4043,7 @@ 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 ();
init_openssl ();
#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; struct server_context ctx;
server_context_init (&ctx); server_context_init (&ctx);

12
zyklonb.c
View File

@ -2010,17 +2010,7 @@ 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 ();
init_openssl ();
#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init ();
// XXX: this list is probably not complete
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 bot_context ctx; struct bot_context ctx;
bot_context_init (&ctx); bot_context_init (&ctx);