summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-05-27 14:09:03 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-05-27 14:09:03 +0000
commit4e96633ac754287a17ae399284987916ce480ef0 (patch)
treecf54c79165418bd6ea2c01cb9b09a6acf2234264 /apps
parent77cf9e09b05126c514f54abacbd11bc5a1d71333 (diff)
PR: 2262
Submitted By: Victor Wagner <vitus@cryptocom.ru> Fix error reporting in load_key function.
Diffstat (limited to 'apps')
-rw-r--r--apps/apps.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/apps/apps.c b/apps/apps.c
index 200f1963f5..1439bb49da 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -875,10 +875,17 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
if (format == FORMAT_ENGINE)
{
if (!e)
- BIO_printf(bio_err,"no engine specified\n");
+ BIO_printf(err,"no engine specified\n");
else
+ {
pkey = ENGINE_load_private_key(e, file,
ui_method, &cb_data);
+ if (!pkey)
+ {
+ BIO_printf(err,"cannot load %s from engine\n",key_descrip);
+ ERR_print_errors(err);
+ }
+ }
goto end;
}
#endif
@@ -937,8 +944,11 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
}
end:
if (key != NULL) BIO_free(key);
- if (pkey == NULL)
+ if (pkey == NULL)
+ {
BIO_printf(err,"unable to load %s\n", key_descrip);
+ ERR_print_errors(err);
+ }
return(pkey);
}