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/kdf.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/kdf.c')
| -rw-r--r-- | apps/kdf.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/kdf.c b/apps/kdf.c index 82818f1ff3..0162ac899a 100644 --- a/apps/kdf.c +++ b/apps/kdf.c @@ -19,7 +19,8 @@ typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, - OPT_KDFOPT, OPT_BIN, OPT_KEYLEN, OPT_OUT + OPT_KDFOPT, OPT_BIN, OPT_KEYLEN, OPT_OUT, + OPT_PROV_ENUM } OPTION_CHOICE; const OPTIONS kdf_options[] = { @@ -36,6 +37,8 @@ const OPTIONS kdf_options[] = { {"binary", OPT_BIN, '-', "Output in binary format (default is hexadecimal)"}, + OPT_PROV_OPTIONS, + OPT_PARAMETERS(), {"kdf_name", 0, 0, "Name of the KDF algorithm"}, {NULL} @@ -80,6 +83,10 @@ opthelp: if (opts == NULL || !sk_OPENSSL_STRING_push(opts, opt_arg())) goto opthelp; break; + case OPT_PROV_CASES: + if (!opt_provider(o)) + goto err; + break; } } argc = opt_num_rest(); |