RT3876: Only load config when needed

[openssl.git] / apps / apps.h

diff --git a/apps/apps.h b/apps/apps.h
index 7033d2e5c65ea18327443383dc37f71b9faa6eb8..a8e0071f4df47d5584567e9cf3ea0ad6ee40433e 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -147,7 +147,6 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
                                        * (see e_os.h).  The string is
                                        * destroyed! */
 
-extern CONF *config;
 extern char *default_config_file;
 extern BIO *bio_in;
 extern BIO *bio_out;
@@ -155,6 +154,7 @@ extern BIO *bio_err;
 BIO *dup_bio_in(void);
 BIO *dup_bio_out(void);
 BIO *bio_open_default(const char *filename, const char *mode);
+CONF *app_load_config(const char* filename);
 void unbuffer(FILE *fp);
 
 /* Often used in calls to bio_open_default. */
@@ -514,9 +514,7 @@ void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
 void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
 # endif
 
-# ifndef OPENSSL_NO_TLSEXT
 unsigned char *next_protos_parse(unsigned short *outlen, const char *in);
-# endif                         /* ndef OPENSSL_NO_TLSEXT */
 
 void print_cert_checks(BIO *bio, X509 *x,
                        const char *checkhost,