Remove some unnecessary recursive includes from the internal apps.h header,
[openssl.git] / apps / apps.h
index c60b28a7e0bc359b459c2f134488fa5dca353e2c..e653bf1b46572bffa1245c0f2418a102b37fbc37 100644 (file)
 
 #include "e_os.h"
 
-#include <openssl/buffer.h>
 #include <openssl/bio.h>
-#include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
 #include <openssl/txt_db.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
 #include <openssl/ossl_typ.h>
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
@@ -133,10 +134,6 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
                                        * (see e_os.h).  The string is
                                        * destroyed! */
 
-#ifdef OPENSSL_NO_STDIO
-BIO_METHOD *BIO_s_file();
-#endif
-
 #ifdef OPENSSL_SYS_WIN32
 #define rename(from,to) WIN32_rename((from),(to))
 int WIN32_rename(char *oldname,char *newname);
@@ -147,8 +144,10 @@ int WIN32_rename(char *oldname,char *newname);
 #define MAIN(a,v)      main(a,v)
 
 #ifndef NON_MAIN
+CONF *config=NULL;
 BIO *bio_err=NULL;
 #else
+extern CONF *config;
 extern BIO *bio_err;
 #endif
 
@@ -161,7 +160,9 @@ extern BIO *bio_err;
 
 #endif
 
+#ifndef OPENSSL_SYS_NETWARE
 #include <signal.h>
+#endif
 
 #ifdef SIGPIPE
 #define do_pipe_sig()  signal(SIGPIPE,SIG_IGN)
@@ -174,29 +175,57 @@ extern BIO *bio_err;
                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() \
-               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)
+#  ifndef OPENSSL_NO_ENGINE
+#    if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
+     defined(OPENSSL_SYS_WIN32)
+#      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 { _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)
+                       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 { CONF_modules_unload(1); destroy_ui_method(); \
+                       EVP_cleanup(); ENGINE_cleanup(); \
+                       CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
+                       ERR_free_strings(); } while(0)
 #  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)
+#    if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
+     defined(OPENSSL_SYS_WIN32)
+#      ifdef _O_BINARY
+#        define apps_startup() \
+                       do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
+                       ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
+                       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(); \
+                       setup_ui_method(); } while(0)
+#      endif
+#    else
+#      define apps_startup() \
+                       do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
+                       ERR_load_crypto_strings(); \
+                       setup_ui_method(); } while(0)
+#    endif
+#    define apps_shutdown() \
+                       do { CONF_modules_unload(1); destroy_ui_method(); \
+                       EVP_cleanup(); \
+                       CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
+                       ERR_free_strings(); } 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
@@ -215,8 +244,8 @@ typedef struct 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 setup_ui_method(void);
+void destroy_ui_method(void);
 
 int should_retry(int i);
 int args_from_file(char *file, int *argc, char **argv[]);
@@ -235,19 +264,59 @@ int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2);
 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,
+EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
        const char *pass, ENGINE *e, const char *key_descrip);
-EVP_PKEY *load_pubkey(BIO *err, const char *file, int format,
+EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
        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);
+#ifndef OPENSSL_NO_ENGINE
 ENGINE *setup_engine(BIO *err, const char *engine, int debug);
+#endif
+
+int load_config(BIO *err, CONF *cnf);
+char *make_config_name(void);
 
 /* 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 DB_type         0
+#define DB_exp_date     1
+#define DB_rev_date     2
+#define DB_serial       3       /* index - unique */
+#define DB_file         4       
+#define DB_name         5       /* index - unique when active and not disabled */
+#define DB_NUMBER       6
+
+#define DB_TYPE_REV    'R'
+#define DB_TYPE_EXP    'E'
+#define DB_TYPE_VAL    'V'
+
+typedef struct db_attr_st
+       {
+       int unique_subject;
+       } DB_ATTR;
+typedef struct ca_db_st
+       {
+       DB_ATTR attributes;
+       TXT_DB *db;
+       } CA_DB;
+
+BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai);
+int save_serial(char *serialfile, char *suffix, BIGNUM *serial, ASN1_INTEGER **retai);
+int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix);
+int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
+CA_DB *load_index(char *dbfile, DB_ATTR *dbattr);
+int index_index(CA_DB *db);
+int save_index(char *dbfile, char *suffix, CA_DB *db);
+int rotate_index(char *dbfile, char *new_suffix, char *old_suffix);
+void free_index(CA_DB *db);
+int index_name_cmp(const char **a, const char **b);
+int parse_yesno(char *str, int def);
+
+X509_NAME *parse_name(char *str, long chtype, int multirdn);
 
 #define FORMAT_UNDEF    0
 #define FORMAT_ASN1     1
@@ -257,6 +326,8 @@ int make_serial_index(TXT_DB *db);
 #define FORMAT_PKCS12   5
 #define FORMAT_SMIME    6
 #define FORMAT_ENGINE   7
+#define FORMAT_IISSGC  8       /* XXX this stupid macro helps us to avoid
+                                * adding yet another param to load_*key() */
 
 #define EXT_COPY_NONE  0
 #define EXT_COPY_ADD   1
@@ -266,4 +337,6 @@ int make_serial_index(TXT_DB *db);
 
 #define APP_PASS_LEN   1024
 
+#define SERIAL_RAND_BITS       64
+
 #endif