summaryrefslogtreecommitdiffstats
path: root/apps/apps.h
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2001-09-10 21:04:14 +0000
committerGeoff Thorpe <geoff@openssl.org>2001-09-10 21:04:14 +0000
commit16e819e1d8916aab302625c065aba567cc403f41 (patch)
tree74ee9a39f4489e1cf6bdc12cd9c29d9bd9aeb903 /apps/apps.h
parent1023cfe70dce41745627abcb3ac0623a2b881e6b (diff)
Put all "common" initialisation in the apps_startup() and apps_shutdown()
macros in apps.h.
Diffstat (limited to 'apps/apps.h')
-rw-r--r--apps/apps.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/apps.h b/apps/apps.h
index 869b13d7a9..191097ffa7 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -126,21 +126,26 @@ extern BIO *bio_err;
# ifdef _O_BINARY
# define apps_startup() \
do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
+ ERR_load_crypto_strings(); \
OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines(); \
setup_ui_method(); } while(0)
# else
# define apps_startup() \
do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
+ ERR_load_crypto_strings(); \
OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines(); \
setup_ui_method(); } while(0)
# endif
# else
# define apps_startup() \
do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
+ ERR_load_crypto_strings(); \
ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
# endif
# define apps_shutdown() \
- do { destroy_ui_method(); CRYPTO_cleanup_all_ex_data(); } while(0)
+ do { destroy_ui_method(); EVP_cleanup(); \
+ ENGINE_cleanup(); CRYPTO_cleanup_all_ex_data(); \
+ ERR_remove_state(0); ERR_free_strings(); } while(0)
#endif
typedef struct args_st