From: Geoff Thorpe <geoff@openssl.org>
Date: Thu, 30 Jan 2003 14:58:44 +0000 (+0000)
Subject: "openssl engine" will not display ENGINE/DSO load failure errors when
X-Git-Tag: BEN_FIPS_TEST_1~38^2~353
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=bb3e67f3157cc44f20c1d3b96611126d4660d225;ds=sidebyside

"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".
---

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();
 					}
 				}