{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1756754548, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"76661c5654a2c9c2116481803a79340f", "commit": {"type":"commit", "time": 1455030698, "time_ofs": 0, "oid_tree": { "oid": "9be2413179dbebeb3d48378be65a5b9ed31ccdbf", "alias": []}, "oid":{ "oid": "b9f757074d470ec6b031f348581160e48202b85c", "alias": []}, "msg": "Get the apps to use auto-init/de-init", "sig_commit": { "git_time": { "time": 1455030698, "offset": 0 }, "name": "Matt Caswell", "email": "matt@openssl.org", "md5": "10f7b441a32d5790efad9fc68cae4af2" }, "sig_author": { "git_time": { "time": 1454949898, "offset": 0 }, "name": "Matt Caswell", "email": "matt@openssl.org", "md5": "10f7b441a32d5790efad9fc68cae4af2" }}, "body": "Get the apps to use auto-init/de-init\n\nClean up the apps so that we make use of the new auto-init/de-init feature.\n\nReviewed-by: Richard Levitte \u003clevitte@openssl.org\u003e\n" , "diff": "diff --git a/apps/openssl.c b/apps/openssl.c\nindex b8da88a..febfc59 100644\n--- a/apps/openssl.c\n+++ b/apps/openssl.c\n@@ -170,44 +170,19 @@ static int apps_startup()\n #ifdef SIGPIPE\n signal(SIGPIPE, SIG_IGN);\n #endif\n- ERR_load_crypto_strings();\n- ERR_load_SSL_strings();\n \n- OPENSSL_load_builtin_modules();\n- SSL_add_ssl_module();\n-#ifndef OPENSSL_NO_ENGINE\n- ENGINE_load_builtin_engines();\n-#endif\n- if (!app_load_modules(NULL)) {\n- ERR_print_errors(bio_err);\n- BIO_printf(bio_err, \u0022Error loading default configuration\u005cn\u0022);\n- return 0;\n- }\n+ /* Set non-default library initialisation settings */\n+ OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ENGINE_ALL_BUILTIN\n+ | OPENSSL_INIT_LOAD_CONFIG, NULL);\n \n- OpenSSL_add_all_algorithms();\n- OpenSSL_add_ssl_algorithms();\n setup_ui_method();\n- /*SSL_library_init();*/\n+\n return 1;\n }\n \n static void apps_shutdown()\n {\n-#ifndef OPENSSL_NO_ENGINE\n- ENGINE_cleanup();\n-#endif\n destroy_ui_method();\n- CONF_modules_unload(1);\n-#ifndef OPENSSL_NO_COMP\n- COMP_zlib_cleanup();\n- SSL_COMP_free_compression_methods();\n-#endif\n- OBJ_cleanup();\n- EVP_cleanup();\n- CRYPTO_cleanup_all_ex_data();\n- ERR_remove_thread_state(NULL);\n- RAND_cleanup();\n- ERR_free_strings();\n }\n \n static char *make_config_name()\n@@ -317,7 +292,6 @@ int main(int argc, char *argv[])\n if (getenv(\u0022OPENSSL_FIPS\u0022)) {\n #ifdef OPENSSL_FIPS\n if (!FIPS_mode_set(1)) {\n- ERR_load_crypto_strings();\n ERR_print_errors(bio_err);\n return 1;\n }\n","s":{"c":1756754548,"u": 2178}} ],"g": 3454,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}