new option "openssl ciphers -V"

[openssl.git] / apps / engine.c

diff --git a/apps/engine.c b/apps/engine.c
index f71076b13b0f203af2d868d117e0770c4bebceec..25c86171079966bdfb7f23c67592f3e82b49d012 100644 (file)
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -56,6 +56,8 @@
  *
  */
 
+#ifndef OPENSSL_NO_ENGINE
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -70,14 +72,15 @@
 #undef PROG
 #define PROG   engine_main
 
-static char *engine_usage[]={
+static const char *engine_usage[]={
 "usage: engine opts [engine ...]\n",
 " -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
 "               -vv will additionally display each command's description\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",
@@ -120,8 +123,8 @@ static int append_buf(char **buf, const char *s, int *size, int step)
                return 0;
 
        if (**buf != '\0')
-               strcat(*buf, ", ");
-       strcat(*buf, s);
+               BUF_strlcat(*buf, ", ", *size);
+       BUF_strlcat(*buf, s, *size);
 
        return 1;
        }
@@ -341,8 +344,8 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
        {
        int ret=1,i;
-       char **pp;
-       int verbose=0, list_cap=0, test_avail=0;
+       const char **pp;
+       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();
@@ -356,6 +359,9 @@ int MAIN(int argc, char **argv)
 
        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
        {
@@ -377,16 +383,26 @@ 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++;
+                       if (argc == 0)
+                               goto skip_arg_loop;
                        sk_push(pre_cmds,*argv);
                        }
                else if (strcmp(*argv,"-post") == 0)
                        {
                        argc--; argv++;
+                       if (argc == 0)
+                               goto skip_arg_loop;
                        sk_push(post_cmds,*argv);
                        }
                else if ((strncmp(*argv,"-h",2) == 0) ||
@@ -493,7 +509,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();
                                        }
                                }
@@ -507,11 +524,19 @@ skip_digests:
 
        ret=0;
 end:
+
        ERR_print_errors(bio_err);
        sk_pop_free(engines, identity);
        sk_pop_free(pre_cmds, identity);
        sk_pop_free(post_cmds, identity);
        if (bio_out != NULL) BIO_free_all(bio_out);
        apps_shutdown();
-       EXIT(ret);
+       OPENSSL_EXIT(ret);
        }
+#else
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
+#endif