diff options
| author | Pauli <paul.dale@oracle.com> | 2020-02-25 14:29:30 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-03-07 11:46:48 +1000 |
| commit | 6bd4e3f231d74578b97821d981d42583fec5c2f3 (patch) | |
| tree | d255cb0db84ccb5bf71fed8e62f4bb310933b5a5 /apps/enc.c | |
| parent | 5e98904c231f5a40c6ce291df85799cca7c8d125 (diff) | |
cmdline app: add provider commandline options.
Add a -provider option to allow providers to be loaded. This option can be
specified multiple times.
Add a -provider_path option to allow the path to providers to be specified.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11167)
Diffstat (limited to 'apps/enc.c')
| -rw-r--r-- | apps/enc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/enc.c b/apps/enc.c index 2b23564fab..74fd6f8469 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -45,7 +45,7 @@ typedef enum OPTION_choice { OPT_NOPAD, OPT_SALT, OPT_NOSALT, OPT_DEBUG, OPT_UPPER_P, OPT_UPPER_A, OPT_A, OPT_Z, OPT_BUFSIZE, OPT_K, OPT_KFILE, OPT_UPPER_K, OPT_NONE, OPT_UPPER_S, OPT_IV, OPT_MD, OPT_ITER, OPT_PBKDF2, OPT_CIPHER, - OPT_R_ENUM + OPT_R_ENUM, OPT_PROV_ENUM } OPTION_CHOICE; const OPTIONS enc_options[] = { @@ -97,6 +97,7 @@ const OPTIONS enc_options[] = { {"", OPT_CIPHER, '-', "Any supported cipher"}, OPT_R_OPTIONS, + OPT_PROV_OPTIONS, {NULL} }; @@ -288,6 +289,10 @@ int enc_main(int argc, char **argv) if (!opt_rand(o)) goto end; break; + case OPT_PROV_CASES: + if (!opt_provider(o)) + goto end; + break; } } if (opt_num_rest() != 0) { |