diff options
author | Geoff Thorpe <geoff@openssl.org> | 2003-01-30 14:58:44 +0000 |
---|---|---|
committer | Geoff Thorpe <geoff@openssl.org> | 2003-01-30 14:58:44 +0000 |
commit | bb3e67f3157cc44f20c1d3b96611126d4660d225 (patch) | |
tree | 9b8c81cc8c1b8d4971cc9909a472da4a0e03c0da | |
parent | c0a93e31ab0bba212092b1125fb076fed69b8b01 (diff) | |
download | openssl-bb3e67f3157cc44f20c1d3b96611126d4660d225.tar.gz |
"openssl engine" will not display ENGINE/DSO load failure errors when
testing availability of engines with "-t" - the old behaviour of is
produced by increasing the feature's verbosity with "-tt".
-rw-r--r-- | apps/engine.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/apps/engine.c b/apps/engine.c index b718ae124c..1a22d5dee9 100644 --- a/apps/engine.c +++ b/apps/engine.c @@ -77,7 +77,8 @@ static char *engine_usage[]={ " -vvv will also add the input flags for each command\n", " -vvvv will also show internal input flags\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", " to load it (if -t is used)\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; 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; STACK *engines = 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) list_cap=1; - else if (strcmp(*argv,"-t") == 0) + else if (strncmp(*argv,"-t",2) == 0) + { 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) { argc--; argv++; @@ -496,7 +503,8 @@ skip_digests: else { BIO_printf(bio_out, "[ unavailable ]\n"); - ERR_print_errors_fp(stdout); + if(test_avail_noise) + ERR_print_errors_fp(stdout); ERR_clear_error(); } } |