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

PR: 2262

Browse Source 
Submitted By: Victor Wagner <vitus@cryptocom.ru>

Fix error reporting in load_key function.
This commit is contained in:
Dr. Stephen Henson 2010-05-27 14:09:22 +00:00
parent 278a447ee8
commit c1f1a03d0c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/apps.c
View File

@ -866,10 +866,17 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
if (format == FORMAT_ENGINE) if (format == FORMAT_ENGINE)
{ {
if (!e) if (!e)
BIO_printf(bio_err,"no engine specified\n"); BIO_printf(err,"no engine specified\n");
else else
{
pkey = ENGINE_load_private_key(e, file, pkey = ENGINE_load_private_key(e, file,
ui_method, &cb_data); ui_method, &cb_data);
if (!pkey)
{
BIO_printf(err,"cannot load %s from engine\n",key_descrip);
ERR_print_errors(err);
}
}
goto end; goto end;
} }
#endif #endif
@ -920,7 +927,10 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
end: end:
if (key != NULL) BIO_free(key); if (key != NULL) BIO_free(key);
if (pkey == NULL) if (pkey == NULL)
{
BIO_printf(err,"unable to load %s\n", key_descrip); BIO_printf(err,"unable to load %s\n", key_descrip);
ERR_print_errors(err);
}
return(pkey); return(pkey);
} }