diff options
Diffstat (limited to 'src/lib/libssl/src/apps/apps.h')
-rw-r--r-- | src/lib/libssl/src/apps/apps.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/lib/libssl/src/apps/apps.h b/src/lib/libssl/src/apps/apps.h index 063f9c65be..2dcdb88c43 100644 --- a/src/lib/libssl/src/apps/apps.h +++ b/src/lib/libssl/src/apps/apps.h | |||
@@ -64,7 +64,17 @@ | |||
64 | #include <openssl/buffer.h> | 64 | #include <openssl/buffer.h> |
65 | #include <openssl/bio.h> | 65 | #include <openssl/bio.h> |
66 | #include <openssl/crypto.h> | 66 | #include <openssl/crypto.h> |
67 | #include "progs.h" | 67 | #include <openssl/x509.h> |
68 | |||
69 | int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn); | ||
70 | int app_RAND_write_file(const char *file, BIO *bio_e); | ||
71 | /* When `file' is NULL, use defaults. | ||
72 | * `bio_e' is for error messages. */ | ||
73 | void app_RAND_allow_write_file(void); | ||
74 | long app_RAND_load_files(char *file); /* `file' is a list of files to read, | ||
75 | * separated by LIST_SEPARATOR_CHAR | ||
76 | * (see e_os.h). The string is | ||
77 | * destroyed! */ | ||
68 | 78 | ||
69 | #ifdef NO_STDIO | 79 | #ifdef NO_STDIO |
70 | BIO_METHOD *BIO_s_file(); | 80 | BIO_METHOD *BIO_s_file(); |
@@ -103,7 +113,7 @@ extern BIO *bio_err; | |||
103 | #define do_pipe_sig() | 113 | #define do_pipe_sig() |
104 | #endif | 114 | #endif |
105 | 115 | ||
106 | #if defined(MONOLITH) && !defined(SSLEAY) | 116 | #if defined(MONOLITH) && !defined(OPENSSL_C) |
107 | # define apps_startup() do_pipe_sig() | 117 | # define apps_startup() do_pipe_sig() |
108 | #else | 118 | #else |
109 | # if defined(MSDOS) || defined(WIN16) || defined(WIN32) | 119 | # if defined(MSDOS) || defined(WIN16) || defined(WIN32) |
@@ -132,10 +142,16 @@ int args_from_file(char *file, int *argc, char **argv[]); | |||
132 | int str2fmt(char *s); | 142 | int str2fmt(char *s); |
133 | void program_name(char *in,char *out,int size); | 143 | void program_name(char *in,char *out,int size); |
134 | int chopup_args(ARGS *arg,char *buf, int *argc, char **argv[]); | 144 | int chopup_args(ARGS *arg,char *buf, int *argc, char **argv[]); |
145 | #ifdef HEADER_X509_H | ||
146 | int dump_cert_text(BIO *out, X509 *x); | ||
147 | #endif | ||
148 | int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2); | ||
135 | #define FORMAT_UNDEF 0 | 149 | #define FORMAT_UNDEF 0 |
136 | #define FORMAT_ASN1 1 | 150 | #define FORMAT_ASN1 1 |
137 | #define FORMAT_TEXT 2 | 151 | #define FORMAT_TEXT 2 |
138 | #define FORMAT_PEM 3 | 152 | #define FORMAT_PEM 3 |
139 | #define FORMAT_NETSCAPE 4 | 153 | #define FORMAT_NETSCAPE 4 |
140 | 154 | ||
155 | #define APP_PASS_LEN 1024 | ||
156 | |||
141 | #endif | 157 | #endif |