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/pkcs12.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/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 091318b67d..c2448a74f5 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -58,7 +58,7 @@ typedef enum OPTION_choice { OPT_INKEY, OPT_CERTFILE, OPT_NAME, OPT_CSP, OPT_CANAME, OPT_IN, OPT_OUT, OPT_PASSIN, OPT_PASSOUT, OPT_PASSWORD, OPT_CAPATH, OPT_CAFILE, OPT_CASTORE, OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE, OPT_ENGINE, - OPT_R_ENUM + OPT_R_ENUM, OPT_PROV_ENUM } OPTION_CHOICE; const OPTIONS pkcs12_options[] = { @@ -130,6 +130,7 @@ const OPTIONS pkcs12_options[] = { {"", OPT_CIPHER, '-', "Any supported cipher"}, OPT_R_OPTIONS, + OPT_PROV_OPTIONS, {NULL} }; @@ -307,6 +308,10 @@ int pkcs12_main(int argc, char **argv) case OPT_ENGINE: e = setup_engine(opt_arg(), 0); break; + case OPT_PROV_CASES: + if (!opt_provider(o)) + goto end; + break; } } argc = opt_num_rest(); |