diff options
| -rw-r--r-- | common.c | 15 | ||||
| -rw-r--r-- | degesch.c | 10 | ||||
| -rw-r--r-- | kike.c | 11 | ||||
| -rw-r--r-- | zyklonb.c | 12 | 
4 files changed, 18 insertions, 30 deletions
| @@ -34,6 +34,21 @@  #include <arpa/inet.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 --------------------------------------------------  static ssize_t @@ -14009,15 +14009,7 @@ 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 +	init_openssl ();  	// Bootstrap configuration, so that we can access schema items at all  	register_config_modules (&ctx); @@ -4043,16 +4043,7 @@ 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 +	init_openssl ();  	struct server_context ctx;  	server_context_init (&ctx); @@ -2010,17 +2010,7 @@ 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 (); -	atexit (ERR_free_strings); -#else -	// Cleanup is done automatically via atexit() -	OPENSSL_init_ssl (0, NULL); -#endif +	init_openssl ();  	struct bot_context ctx;  	bot_context_init (&ctx); | 
