projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
It seems like gcc does canonicalisation of file names. More
[openssl.git]
/
apps
/
engine.c
diff --git
a/apps/engine.c
b/apps/engine.c
index ebaeeabf210e9a5fb512d0be9531fda88a55491f..8a04fbcd64568775daa6b0215751c24c640219f0 100644
(file)
--- a/
apps/engine.c
+++ b/
apps/engine.c
@@
-430,9
+430,10
@@
skip_arg_loop:
{
int cap_size = 256;
char *cap_buf = NULL;
{
int cap_size = 256;
char *cap_buf = NULL;
-#if 0 /* Awaiting EVP_[CIPHER|DIGEST] refit */
int k,n;
int k,n;
-#endif
+ const int *nids;
+ ENGINE_CIPHERS_PTR fn_c;
+ ENGINE_DIGESTS_PTR fn_d;
if (ENGINE_get_RSA(e) != NULL
&& !append_buf(&cap_buf, "RSA",
if (ENGINE_get_RSA(e) != NULL
&& !append_buf(&cap_buf, "RSA",
@@
-451,15
+452,26
@@
skip_arg_loop:
&cap_size, 256))
goto end;
&cap_size, 256))
goto end;
-#if 0
- n=ENGINE_cipher_num(e);
+ fn_c = ENGINE_get_ciphers(e);
+ if(!fn_c) goto skip_ciphers;
+ n = fn_c(e, NULL, &nids, 0);
for(k=0 ; k < n ; ++k)
if(!append_buf(&cap_buf,
for(k=0 ; k < n ; ++k)
if(!append_buf(&cap_buf,
- OBJ_nid2sn(ENGINE_get_cipher(e, k)->nid),
+ OBJ_nid2sn(nids[k]),
+ &cap_size, 256))
+ goto end;
+
+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;
&cap_size, 256))
goto end;
-#endif
+skip_digests:
if (cap_buf && (*cap_buf != '\0'))
BIO_printf(bio_out, " [%s]", cap_buf);
if (cap_buf && (*cap_buf != '\0'))
BIO_printf(bio_out, " [%s]", cap_buf);