generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get the apps to use auto-init/de-init

Browse Source 
Clean up the apps so that we make use of the new auto-init/de-init feature.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2016-02-08 16:44:58 +00:00
parent 7fa792d14d
commit b9f757074d
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
apps/openssl.c
View File

@ -170,44 +170,19 @@ static int apps_startup()
#ifdef SIGPIPE #ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
#endif #endif
ERR_load_crypto_strings();
ERR_load_SSL_strings();
OPENSSL_load_builtin_modules(); /* Set non-default library initialisation settings */
SSL_add_ssl_module(); OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ENGINE_ALL_BUILTIN
#ifndef OPENSSL_NO_ENGINE | OPENSSL_INIT_LOAD_CONFIG, NULL);
ENGINE_load_builtin_engines();
#endif
if (!app_load_modules(NULL)) {
ERR_print_errors(bio_err);
BIO_printf(bio_err, "Error loading default configuration\n");
return 0;
}
OpenSSL_add_all_algorithms();
OpenSSL_add_ssl_algorithms();
setup_ui_method(); setup_ui_method();
/*SSL_library_init();*/
return 1; return 1;
} }
static void apps_shutdown() static void apps_shutdown()
{ {
#ifndef OPENSSL_NO_ENGINE
ENGINE_cleanup();
#endif
destroy_ui_method(); destroy_ui_method();
CONF_modules_unload(1);
#ifndef OPENSSL_NO_COMP
COMP_zlib_cleanup();
SSL_COMP_free_compression_methods();
#endif
OBJ_cleanup();
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();
ERR_remove_thread_state(NULL);
RAND_cleanup();
ERR_free_strings();
} }
static char *make_config_name() static char *make_config_name()
@ -317,7 +292,6 @@ int main(int argc, char *argv[])
if (getenv("OPENSSL_FIPS")) { if (getenv("OPENSSL_FIPS")) {
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
if (!FIPS_mode_set(1)) { if (!FIPS_mode_set(1)) {
ERR_load_crypto_strings();
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
return 1; return 1;
} }