Put all "common" initialisation in the apps_startup() and apps_shutdown()

[openssl.git] / apps / apps.h

diff --git a/apps/apps.h b/apps/apps.h
index 7f3903478ff4211a3a057fd6162cd50173b6f178..191097ffa7c18e208044590c83121404a160d603 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -68,6 +68,7 @@
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
 #include <openssl/engine.h>
+#include <openssl/txt_db.h>
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
 int app_RAND_write_file(const char *file, BIO *bio_e);
@@ -101,7 +102,7 @@ extern BIO *bio_err;
 #else
 
 #define MAIN(a,v)      PROG(a,v)
-extern LHASH *config;
+extern CONF *config;
 extern char *default_config_file;
 extern BIO *bio_err;
 
@@ -116,26 +117,35 @@ extern BIO *bio_err;
 #endif
 
 #if defined(MONOLITH) && !defined(OPENSSL_C)
-#  define apps_startup()       do_pipe_sig()
+#  define apps_startup() \
+               do_pipe_sig()
+#  define apps_shutdown()
 #else
 #  if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
    defined(OPENSSL_SYS_WIN32)
 #    ifdef _O_BINARY
 #      define apps_startup() \
-               _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
+               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();
+                setup_ui_method(); } while(0)
 #    else
 #      define apps_startup() \
-               _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
+               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();
+                setup_ui_method(); } while(0)
 #    endif
 #  else
 #    define apps_startup() \
-               do_pipe_sig(); OpenSSL_add_all_algorithms(); \
-               ENGINE_load_builtin_engines(); setup_ui_method();
+               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(); EVP_cleanup(); \
+               ENGINE_cleanup(); CRYPTO_cleanup_all_ex_data(); \
+               ERR_remove_state(0); ERR_free_strings(); } while(0)
 #endif
 
 typedef struct args_st
@@ -171,7 +181,7 @@ int set_name_ex(unsigned long *flags, const char *arg);
 int set_ext_copy(int *copy_type, const char *arg);
 int copy_extensions(X509 *x, X509_REQ *req, int copy_type);
 int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2);
-int add_oid_section(BIO *err, LHASH *conf);
+int add_oid_section(BIO *err, CONF *conf);
 X509 *load_cert(BIO *err, const char *file, int format,
        const char *pass, ENGINE *e, const char *cert_descrip);
 EVP_PKEY *load_key(BIO *err, const char *file, int format,
@@ -183,6 +193,11 @@ STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
 X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath);
 ENGINE *setup_engine(BIO *err, const char *engine, int debug);
 
+/* Functions defined in ca.c and also used in ocsp.c */
+int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
+                       ASN1_GENERALIZEDTIME **pinvtm, char *str);
+int make_serial_index(TXT_DB *db);
+
 #define FORMAT_UNDEF    0
 #define FORMAT_ASN1     1
 #define FORMAT_TEXT     2