generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update from main branch.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2002-02-23 01:47:59 +00:00
parent 63dc69fef6
commit 3f7cf29124
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/apps.c
View File

@ -1315,21 +1315,19 @@ ENGINE *setup_engine(BIO *err, const char *engine, int debug)
return e; return e;
} }
int load_config(char *filename, BIO *err) int load_config(BIO *err, CONF *cnf)
{ {
unsigned long flags; if (!cnf)
if (filename) cnf = config;
flags = 0; if (!cnf)
else return 1;
flags = CONF_MFLAGS_IGNORE_MISSING_FILE;
if (CONF_modules_load_file(filename, NULL, flags) <= 0) OPENSSL_load_builtin_modules();
if (CONF_modules_load(cnf, NULL, 0) <= 0)
{ {
if (err) BIO_printf(err, "Error configuring OpenSSL\n");
{ ERR_print_errors(err);
BIO_printf(err, "Error loading config file\n");
ERR_print_errors(err);
}
return 0; return 0;
} }
return 1; return 1;

2
crypto/conf/conf.h
View File

@ -194,6 +194,8 @@ char *CONF_get1_default_config_file(void);
int CONF_parse_list(const char *list, int sep, int nospc, int CONF_parse_list(const char *list, int sep, int nospc,
int (*list_cb)(const char *elem, int len, void *usr), void *arg); int (*list_cb)(const char *elem, int len, void *usr), void *arg);
void OPENSSL_load_builtin_modules(void);
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes /* The following lines are auto generated by the script mkerr.pl. Any changes
* made after this point may be overwritten when the script is next run. * made after this point may be overwritten when the script is next run.