New cofiguration for Unixwre and SCO,with slightly better granularity. Contributed...

[openssl.git] / apps / apps.h

diff --git a/apps/apps.h b/apps/apps.h
index 2da89e2112e6f68af12d8b91e2882529f6e67af3..96dafd972d0f524540ca5dcccfdf686e8887cec0 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -59,7 +59,7 @@
 #ifndef HEADER_APPS_H
 #define HEADER_APPS_H
 
-#include "openssl/e_os.h"
+#include "e_os.h"
 
 #include <openssl/buffer.h>
 #include <openssl/bio.h>
@@ -79,11 +79,11 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
                                        * (see e_os.h).  The string is
                                        * destroyed! */
 
-#ifdef NO_STDIO
+#ifdef OPENSSL_NO_STDIO
 BIO_METHOD *BIO_s_file();
 #endif
 
-#ifdef WIN32
+#ifdef OPENSSL_SYS_WIN32
 #define rename(from,to) WIN32_rename((from),(to))
 int WIN32_rename(char *oldname,char *newname);
 #endif
@@ -118,19 +118,20 @@ extern BIO *bio_err;
 #if defined(MONOLITH) && !defined(OPENSSL_C)
 #  define apps_startup()       do_pipe_sig()
 #else
-#  if defined(MSDOS) || defined(WIN16) || defined(WIN32)
+#  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(); \
-               SSLeay_add_all_algorithms(); ENGINE_load_builtin_engines()
+               OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines()
 #    else
 #      define apps_startup() \
                _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-               SSLeay_add_all_algorithms(); ENGINE_load_builtin_engines()
+               OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines()
 #    endif
 #  else
 #    define apps_startup() \
-               do_pipe_sig(); SSLeay_add_all_algorithms(); \
+               do_pipe_sig(); OpenSSL_add_all_algorithms(); \
                ENGINE_load_builtin_engines()
 #  endif
 #endif
@@ -152,6 +153,8 @@ void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags);
 #endif
 int set_cert_ex(unsigned long *flags, const char *arg);
 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);
@@ -169,6 +172,10 @@ X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath);
 #define FORMAT_SMIME    6
 #define FORMAT_ENGINE   7
 
+#define EXT_COPY_NONE  0
+#define EXT_COPY_ADD   1
+#define EXT_COPY_ALL   2
+
 #define NETSCAPE_CERT_HDR      "certificate"
 
 #define APP_PASS_LEN   1024