ENGINE_register_all_complete() will register all implementations of all

[openssl.git] / apps / apps.h

diff --git a/apps/apps.h b/apps/apps.h
index 96dafd972d0f524540ca5dcccfdf686e8887cec0..57ca7659ae1861ebccaac2595c84fe83cf47a735 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -67,7 +67,8 @@
 #include <openssl/x509.h>
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
-#include <openssl/engine.h>
+#include <openssl/txt_db.h>
+#include <openssl/types.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,24 +117,33 @@ 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(); \
-               OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines()
+               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() \
-               _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-               OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines()
+               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_pipe_sig(); OpenSSL_add_all_algorithms(); \
-               ENGINE_load_builtin_engines()
+               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
@@ -142,6 +152,19 @@ typedef struct args_st
        int count;
        } ARGS;
 
+#define PW_MIN_LENGTH 4
+typedef struct pw_cb_data
+       {
+       const void *password;
+       const char *prompt_info;
+       } PW_CB_DATA;
+
+int password_callback(char *buf, int bufsiz, int verify,
+       PW_CB_DATA *cb_data);
+
+int setup_ui_method();
+void destroy_ui_method();
+
 int should_retry(int i);
 int args_from_file(char *file, int *argc, char **argv[]);
 int str2fmt(char *s);
@@ -156,12 +179,22 @@ 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);
-X509 *load_cert(BIO *err, char *file, int format);
-EVP_PKEY *load_key(BIO *err, char *file, int format, char *pass, ENGINE *e);
-EVP_PKEY *load_pubkey(BIO *err, char *file, int format, ENGINE *e);
-STACK_OF(X509) *load_certs(BIO *err, char *file, int format);
+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,
+       const char *pass, ENGINE *e, const char *key_descrip);
+EVP_PKEY *load_pubkey(BIO *err, const char *file, int format,
+       const char *pass, ENGINE *e, const char *key_descrip);
+STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
+       const char *pass, ENGINE *e, const char *cert_descrip);
 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