*
*/
+#ifndef OPENSSL_NO_ENGINE
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
" -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",
return 0;
if (**buf != '\0')
- strcat(*buf, ", ");
- strcat(*buf, s);
+ BUF_strlcat(*buf, ", ", *size);
+ BUF_strlcat(*buf, s, *size);
return 1;
}
{
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();
}
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++;
else
{
BIO_printf(bio_out, "[ unavailable ]\n");
- ERR_print_errors_fp(stdout);
+ if(test_avail_noise)
+ ERR_print_errors_fp(stdout);
ERR_clear_error();
}
}
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