Change the order of events so the capabilities of loaded engines can
get listed as well.
This commit is contained in:
parent
0b0b2a8087
commit
817dfc18a3
@ -423,9 +423,13 @@ skip_arg_loop:
|
|||||||
{
|
{
|
||||||
const char *name = ENGINE_get_name(e);
|
const char *name = ENGINE_get_name(e);
|
||||||
/* Do "id" first, then "name". Easier to auto-parse. */
|
/* Do "id" first, then "name". Easier to auto-parse. */
|
||||||
BIO_printf(bio_out, "(%s) %s", id, name);
|
BIO_printf(bio_out, "(%s) %s\n", id, name);
|
||||||
if (list_cap)
|
util_do_cmds(e, pre_cmds, bio_out, indent);
|
||||||
BIO_printf(bio_out, ":");
|
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)
|
if (list_cap)
|
||||||
{
|
{
|
||||||
int cap_size = 256;
|
int cap_size = 256;
|
||||||
@ -473,12 +477,10 @@ skip_ciphers:
|
|||||||
|
|
||||||
skip_digests:
|
skip_digests:
|
||||||
if (cap_buf && (*cap_buf != '\0'))
|
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)
|
if(test_avail)
|
||||||
{
|
{
|
||||||
BIO_printf(bio_out, "%s", indent);
|
BIO_printf(bio_out, "%s", indent);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user