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

[openssl.git] / apps / engine.c

diff --git a/apps/engine.c b/apps/engine.c
index 8a04fbcd64568775daa6b0215751c24c640219f0..1a22d5dee9224df23e7e5cc79c02040c85eae08c 100644 (file)
--- 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",
 "               -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",
 " -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 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();
        ENGINE *e;
        STACK *engines = sk_new_null();
        STACK *pre_cmds = sk_new_null();


@@ -356,6 +357,9 @@ int MAIN(int argc, char **argv)
 
        if (bio_err == NULL)
                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
        if (bio_err == NULL)
                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);

+
+       if (!load_config(bio_err, NULL))
+               goto end;

        bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
        {
        bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
        {


@@ -377,8 +381,14 @@ int MAIN(int argc, char **argv)
                        }
                else if (strcmp(*argv,"-c") == 0)
                        list_cap=1;
                        }
                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;
                        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++;
                else if (strcmp(*argv,"-pre") == 0)
                        {
                        argc--; argv++;


@@ -423,9 +433,13 @@ skip_arg_loop:
                        {
                        const char *name = ENGINE_get_name(e);
                        /* Do "id" first, then "name". Easier to auto-parse. */
                        {
                        const char *name = ENGINE_get_name(e);
                        /* Do "id" first, then "name". Easier to auto-parse. */

-                       BIO_printf(bio_out, "(%s) %s", id, name);
-                       if (list_cap)
-                               BIO_printf(bio_out, ":");
+                       BIO_printf(bio_out, "(%s) %s\n", id, name);
+                       util_do_cmds(e, pre_cmds, bio_out, indent);
+                       if (strcmp(ENGINE_get_id(e), id) != 0)
+                               {
+                               BIO_printf(bio_out, "Loaded: (%s) %s\n",
+                                       ENGINE_get_id(e), ENGINE_get_name(e));
+                               }

                        if (list_cap)
                                {
                                int cap_size = 256;
                        if (list_cap)
                                {
                                int cap_size = 256;


@@ -473,12 +487,10 @@ skip_ciphers:
 
 skip_digests:
                                if (cap_buf && (*cap_buf != '\0'))
 
 skip_digests:
                                if (cap_buf && (*cap_buf != '\0'))

-                                       BIO_printf(bio_out, " [%s]", cap_buf);
+                                       BIO_printf(bio_out, " [%s]\n", cap_buf);

 
                                OPENSSL_free(cap_buf);
                                }
 
                                OPENSSL_free(cap_buf);
                                }

-                       BIO_printf(bio_out, "\n");
-                       util_do_cmds(e, pre_cmds, bio_out, indent);

                        if(test_avail)
                                {
                                BIO_printf(bio_out, "%s", indent);
                        if(test_avail)
                                {
                                BIO_printf(bio_out, "%s", indent);


@@ -491,7 +503,8 @@ skip_digests:
                                else
                                        {
                                        BIO_printf(bio_out, "[ unavailable ]\n");
                                else
                                        {
                                        BIO_printf(bio_out, "[ unavailable ]\n");

-                                       ERR_print_errors_fp(stdout);
+                                       if(test_avail_noise)
+                                               ERR_print_errors_fp(stdout);

                                        ERR_clear_error();
                                        }
                                }
                                        ERR_clear_error();
                                        }
                                }


@@ -511,5 +524,5 @@ end:
        sk_pop_free(post_cmds, identity);
        if (bio_out != NULL) BIO_free_all(bio_out);
        apps_shutdown();
        sk_pop_free(post_cmds, identity);
        if (bio_out != NULL) BIO_free_all(bio_out);
        apps_shutdown();

-       EXIT(ret);
+       OPENSSL_EXIT(ret);

        }
        }