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/spkac.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/spkac.c')
-rw-r--r-- | apps/spkac.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/spkac.c b/apps/spkac.c index 75e246a110..dbd3d45216 100644 --- a/apps/spkac.c +++ b/apps/spkac.c @@ -24,7 +24,8 @@ typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, OPT_NOOUT, OPT_PUBKEY, OPT_VERIFY, OPT_IN, OPT_OUT, OPT_ENGINE, OPT_KEY, OPT_CHALLENGE, OPT_PASSIN, OPT_SPKAC, - OPT_SPKSECT, OPT_KEYFORM + OPT_SPKSECT, OPT_KEYFORM, + OPT_PROV_ENUM } OPTION_CHOICE; const OPTIONS spkac_options[] = { @@ -49,6 +50,8 @@ const OPTIONS spkac_options[] = { {"noout", OPT_NOOUT, '-', "Don't print SPKAC"}, {"pubkey", OPT_PUBKEY, '-', "Output public key"}, {"verify", OPT_VERIFY, '-', "Verify SPKAC signature"}, + + OPT_PROV_OPTIONS, {NULL} }; @@ -116,6 +119,10 @@ int spkac_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(); |