Make "openssl engine -c" list any supported digests as well as supported
ciphers.
This commit is contained in:
parent
2bfb2398e3
commit
4ba163cbf9
1 changed files with 15 additions and 4 deletions
|
@ -432,7 +432,8 @@ skip_arg_loop:
|
||||||
char *cap_buf = NULL;
|
char *cap_buf = NULL;
|
||||||
int k,n;
|
int k,n;
|
||||||
const int *nids;
|
const int *nids;
|
||||||
ENGINE_CIPHERS_PTR fn;
|
ENGINE_CIPHERS_PTR fn_c;
|
||||||
|
ENGINE_DIGESTS_PTR fn_d;
|
||||||
|
|
||||||
if (ENGINE_get_RSA(e) != NULL
|
if (ENGINE_get_RSA(e) != NULL
|
||||||
&& !append_buf(&cap_buf, "RSA",
|
&& !append_buf(&cap_buf, "RSA",
|
||||||
|
@ -451,9 +452,9 @@ skip_arg_loop:
|
||||||
&cap_size, 256))
|
&cap_size, 256))
|
||||||
goto end;
|
goto end;
|
||||||
|
|
||||||
fn = ENGINE_get_ciphers(e);
|
fn_c = ENGINE_get_ciphers(e);
|
||||||
if(!fn) goto skip_ciphers;
|
if(!fn_c) goto skip_ciphers;
|
||||||
n = fn(e, NULL, &nids, 0);
|
n = fn_c(e, NULL, &nids, 0);
|
||||||
for(k=0 ; k < n ; ++k)
|
for(k=0 ; k < n ; ++k)
|
||||||
if(!append_buf(&cap_buf,
|
if(!append_buf(&cap_buf,
|
||||||
OBJ_nid2sn(nids[k]),
|
OBJ_nid2sn(nids[k]),
|
||||||
|
@ -461,6 +462,16 @@ skip_arg_loop:
|
||||||
goto end;
|
goto end;
|
||||||
|
|
||||||
skip_ciphers:
|
skip_ciphers:
|
||||||
|
fn_d = ENGINE_get_digests(e);
|
||||||
|
if(!fn_d) goto skip_digests;
|
||||||
|
n = fn_d(e, NULL, &nids, 0);
|
||||||
|
for(k=0 ; k < n ; ++k)
|
||||||
|
if(!append_buf(&cap_buf,
|
||||||
|
OBJ_nid2sn(nids[k]),
|
||||||
|
&cap_size, 256))
|
||||||
|
goto end;
|
||||||
|
|
||||||
|
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]", cap_buf);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue