summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2008-09-12 13:29:59 +0000
committerBen Laurie <ben@openssl.org>2008-09-12 13:29:59 +0000
commitb7c8b4fc9557be535e4feae971e5503dbdce60ad (patch)
tree2b746533832f16db004a422af3c4ecd662f2ee0f /apps
parentf58d0f70b69075b15a205ea40417be3b8662f426 (diff)
Allow soft-loading engines.
Diffstat (limited to 'apps')
-rw-r--r--apps/openssl.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/apps/openssl.c b/apps/openssl.c
index 47aee5b712..ec25f990fe 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -273,9 +273,21 @@ int main(int Argc, char *Argv[])
i=NCONF_load(config,p,&errline);
if (i == 0)
{
- NCONF_free(config);
- config = NULL;
- ERR_clear_error();
+ if (ERR_GET_REASON(ERR_peek_last_error())
+ == CONF_R_NO_SUCH_FILE)
+ {
+ BIO_printf(bio_err,
+ "WARNING: can't open config file: %s\n",p);
+ ERR_clear_error();
+ NCONF_free(config);
+ config = NULL;
+ }
+ else
+ {
+ ERR_print_errors(bio_err);
+ NCONF_free(config);
+ exit(1);
+ }
}
prog=prog_init();