Make sure that settings are passed back and forth when walking around

[openssl.git] / apps / apps.h

diff --git a/apps/apps.h b/apps/apps.h
index 810710909c35cbeece48c5f366abc4aad1fdec9e..5b3836ab2289ae3dd7f97b993f44a2047aa2bb92 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -55,6 +55,59 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+/* ====================================================================
+ * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
 
 #ifndef HEADER_APPS_H
 #define HEADER_APPS_H
@@ -68,7 +121,8 @@
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
 #include <openssl/txt_db.h>
-#include <openssl/types.h>
+#include <openssl/engine.h>
+#include <openssl/ossl_typ.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);
@@ -127,25 +181,24 @@ extern BIO *bio_err;
 #      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(); ENGINE_register_all_complete(); \
-               setup_ui_method(); } while(0)
+               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(); ENGINE_register_all_complete(); \
-               setup_ui_method(); } while(0)
+               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(); \
-               ENGINE_register_all_complete(); setup_ui_method(); } while(0)
+               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)
+               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)
 #endif
 
 typedef struct args_st
@@ -193,11 +246,15 @@ 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);
 
+int load_config(BIO *err, CONF *cnf);
+
 /* 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);
 
+X509_NAME *do_subject(char *str, long chtype);
+
 #define FORMAT_UNDEF    0
 #define FORMAT_ASN1     1
 #define FORMAT_TEXT     2
@@ -206,6 +263,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