diff options
author | Tomas Mraz <tmraz@fedoraproject.org> | 2019-03-07 15:28:30 +0100 |
---|---|---|
committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-03-09 00:32:04 +0100 |
commit | ebb7823e14596ad07fdc7d2ed0a267815f545927 (patch) | |
tree | a3a7d9679c9fdce87fa6f16257a5b7ad2afc4826 /apps/openssl.c | |
parent | 0fc4d00a00e5d25ce202e69414432a07c9e74502 (diff) |
Print all loaded engines with openssl list -engines
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/8434)
Diffstat (limited to 'apps/openssl.c')
-rw-r--r-- | apps/openssl.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index 854f943f66..1acae24215 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -54,6 +54,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[]); static void list_pkey(void); static void list_pkey_meth(void); static void list_type(FUNC_TYPE ft, int one); +static void list_engines(void); static void list_disabled(void); char *default_config_file = NULL; @@ -523,8 +524,8 @@ typedef enum HELPLIST_CHOICE { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, OPT_ONE, OPT_COMMANDS, OPT_DIGEST_COMMANDS, OPT_MAC_ALGORITHMS, OPT_OPTIONS, OPT_DIGEST_ALGORITHMS, OPT_CIPHER_COMMANDS, OPT_CIPHER_ALGORITHMS, - OPT_PK_ALGORITHMS, OPT_PK_METHOD, OPT_DISABLED, OPT_MISSING_HELP, - OPT_OBJECTS + OPT_PK_ALGORITHMS, OPT_PK_METHOD, OPT_ENGINES, OPT_DISABLED, + OPT_MISSING_HELP, OPT_OBJECTS } HELPLIST_CHOICE; const OPTIONS list_options[] = { @@ -544,6 +545,8 @@ const OPTIONS list_options[] = { "List of public key algorithms"}, {"public-key-methods", OPT_PK_METHOD, '-', "List of public key methods"}, + {"engines", OPT_ENGINES, '-', + "List of loaded engines"}, {"disabled", OPT_DISABLED, '-', "List of disabled features"}, {"missing-help", OPT_MISSING_HELP, '-', @@ -599,6 +602,9 @@ opthelp: case OPT_PK_METHOD: list_pkey_meth(); break; + case OPT_ENGINES: + list_engines(); + break; case OPT_DISABLED: list_disabled(); break; @@ -837,6 +843,22 @@ static int SortFnByName(const void *_f1, const void *_f2) return strcmp(f1->name, f2->name); } +static void list_engines(void) +{ +#ifndef OPENSSL_NO_ENGINES + ENGINE *e; + + BIO_puts(bio_out, "Engines:\n"); + e = ENGINE_get_first(); + while (e) { + BIO_printf(bio_out, "%s\n", ENGINE_get_id(e)); + e = ENGINE_get_next(e); + } +#else + BIO_puts(bio_out, "Engine support is disabled.\n"); +#endif +} + static void list_disabled(void) { BIO_puts(bio_out, "Disabled algorithms:\n"); |