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

"openssl engine" will not display ENGINE/DSO load failure errors when

Browse Source 
testing availability of engines with "-t" - the old behaviour of is
produced by increasing the feature's verbosity with "-tt".
This commit is contained in:
Geoff Thorpe 2003-01-30 14:58:44 +00:00
parent c0a93e31ab
commit bb3e67f315
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/engine.c
View File

@ -77,7 +77,8 @@ static char *engine_usage[]={
" -vvv will also add the input flags for each command\n", " -vvv will also add the input flags for each command\n",
" -vvvv will also show internal input flags\n", " -vvvv will also show internal input flags\n",
" -c - for each engine, also list the capabilities\n", " -c - for each engine, also list the capabilities\n",
" -t - for each engine, check that they are really available\n", " -t[t] - for each engine, check that they are really available\n",
" -tt will display error trace for unavailable engines\n",
" -pre <cmd> - runs command 'cmd' against the ENGINE before any attempts\n", " -pre <cmd> - runs command 'cmd' against the ENGINE before any attempts\n",
" to load it (if -t is used)\n", " to load it (if -t is used)\n",
" -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n", " -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n",
@ -342,7 +343,7 @@ int MAIN(int argc, char **argv)
{ {
int ret=1,i; int ret=1,i;
char **pp; char **pp;
int verbose=0, list_cap=0, test_avail=0; int verbose=0, list_cap=0, test_avail=0, test_avail_noise = 0;
ENGINE *e; ENGINE *e;
STACK *engines = sk_new_null(); STACK *engines = sk_new_null();
STACK *pre_cmds = sk_new_null(); STACK *pre_cmds = sk_new_null();
@ -380,8 +381,14 @@ int MAIN(int argc, char **argv)
} }
else if (strcmp(*argv,"-c") == 0) else if (strcmp(*argv,"-c") == 0)
list_cap=1; list_cap=1;
else if (strcmp(*argv,"-t") == 0) else if (strncmp(*argv,"-t",2) == 0)
{
test_avail=1; test_avail=1;
if(strspn(*argv + 1, "t") < strlen(*argv + 1))
goto skip_arg_loop;
if((test_avail_noise = strlen(*argv + 1) - 1) > 1)
goto skip_arg_loop;
}
else if (strcmp(*argv,"-pre") == 0) else if (strcmp(*argv,"-pre") == 0)
{ {
argc--; argv++; argc--; argv++;
@ -496,6 +503,7 @@ skip_digests:
else else
{ {
BIO_printf(bio_out, "[ unavailable ]\n"); BIO_printf(bio_out, "[ unavailable ]\n");
if(test_avail_noise)
ERR_print_errors_fp(stdout); ERR_print_errors_fp(stdout);
ERR_clear_error(); ERR_clear_error();
} }