Only use DSA-functions if available.

[openssl.git] / apps / engine.c

diff --git a/apps/engine.c b/apps/engine.c
index 1b2fc50cc2a00ae539225afa047efbdfede4cc9a..734ecb3e5db0a4581bc5e495d7057f8785536041 100644 (file)
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -356,6 +356,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
        {
@@ -423,14 +426,21 @@ skip_arg_loop:
                        {
                        const char *name = ENGINE_get_name(e);
                        /* Do "id" first, then "name". Easier to auto-parse. */
-                       BIO_printf(bio_out, "(%s) %s", id, name);
-                       if (list_cap)
-                               BIO_printf(bio_out, ":");
+                       BIO_printf(bio_out, "(%s) %s\n", id, name);
+                       util_do_cmds(e, pre_cmds, bio_out, indent);
+                       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)
                                {
                                int cap_size = 256;
                                char *cap_buf = NULL;
                                int k,n;
+                               const int *nids;
+                               ENGINE_CIPHERS_PTR fn_c;
+                               ENGINE_DIGESTS_PTR fn_d;
 
                                if (ENGINE_get_RSA(e) != NULL
                                        && !append_buf(&cap_buf, "RSA",
@@ -449,20 +459,31 @@ skip_arg_loop:
                                                &cap_size, 256))
                                        goto end;
 
-                               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,
-                                                      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;
+
+skip_digests:
                                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);
                                }
-                       BIO_printf(bio_out, "\n");
-                       util_do_cmds(e, pre_cmds, bio_out, indent);
                        if(test_avail)
                                {
                                BIO_printf(bio_out, "%s", indent);