diff options
author | Pauli <paul.dale@oracle.com> | 2020-02-25 05:29:30 +0100 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2020-03-07 02:46:48 +0100 |
commit | 6bd4e3f231d74578b97821d981d42583fec5c2f3 (patch) | |
tree | d255cb0db84ccb5bf71fed8e62f4bb310933b5a5 /apps/pkcs7.c | |
parent | man1: make all openssl command line tool documentation generated. (diff) | |
download | openssl-6bd4e3f231d74578b97821d981d42583fec5c2f3.tar.xz openssl-6bd4e3f231d74578b97821d981d42583fec5c2f3.zip |
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/pkcs7.c')
-rw-r--r-- | apps/pkcs7.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/pkcs7.c b/apps/pkcs7.c index bd1cb1013c..9c74d99aca 100644 --- a/apps/pkcs7.c +++ b/apps/pkcs7.c @@ -23,7 +23,8 @@ typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_NOOUT, - OPT_TEXT, OPT_PRINT, OPT_PRINT_CERTS, OPT_ENGINE + OPT_TEXT, OPT_PRINT, OPT_PRINT_CERTS, OPT_ENGINE, + OPT_PROV_ENUM } OPTION_CHOICE; const OPTIONS pkcs7_options[] = { @@ -45,6 +46,8 @@ const OPTIONS pkcs7_options[] = { {"print", OPT_PRINT, '-', "Print out all fields of the PKCS7 structure"}, {"print_certs", OPT_PRINT_CERTS, '-', "Print_certs print any certs or crl in the input"}, + + OPT_PROV_OPTIONS, {NULL} }; @@ -99,6 +102,10 @@ int pkcs7_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(); |