summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src/apps/apps.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/src/apps/apps.h')
-rw-r--r--src/lib/libssl/src/apps/apps.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/libssl/src/apps/apps.h b/src/lib/libssl/src/apps/apps.h
index 0df170813a..88579094b1 100644
--- a/src/lib/libssl/src/apps/apps.h
+++ b/src/lib/libssl/src/apps/apps.h
@@ -149,9 +149,11 @@ int WIN32_rename(const char *oldname,const char *newname);
149#ifndef NON_MAIN 149#ifndef NON_MAIN
150CONF *config=NULL; 150CONF *config=NULL;
151BIO *bio_err=NULL; 151BIO *bio_err=NULL;
152int in_FIPS_mode=0;
152#else 153#else
153extern CONF *config; 154extern CONF *config;
154extern BIO *bio_err; 155extern BIO *bio_err;
156extern int in_FIPS_mode;
155#endif 157#endif
156 158
157#else 159#else
@@ -160,6 +162,7 @@ extern BIO *bio_err;
160extern CONF *config; 162extern CONF *config;
161extern char *default_config_file; 163extern char *default_config_file;
162extern BIO *bio_err; 164extern BIO *bio_err;
165extern int in_FIPS_mode;
163 166
164#endif 167#endif
165 168
@@ -335,6 +338,10 @@ X509_NAME *parse_name(char *str, long chtype, int multirdn);
335int args_verify(char ***pargs, int *pargc, 338int args_verify(char ***pargs, int *pargc,
336 int *badarg, BIO *err, X509_VERIFY_PARAM **pm); 339 int *badarg, BIO *err, X509_VERIFY_PARAM **pm);
337void policies_print(BIO *out, X509_STORE_CTX *ctx); 340void policies_print(BIO *out, X509_STORE_CTX *ctx);
341#ifndef OPENSSL_NO_JPAKE
342void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
343void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
344#endif
338 345
339#define FORMAT_UNDEF 0 346#define FORMAT_UNDEF 0
340#define FORMAT_ASN1 1 347#define FORMAT_ASN1 1