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/ciphers.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/ciphers.c')
| -rw-r--r-- | apps/ciphers.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/ciphers.c b/apps/ciphers.c index 280a5ab477..9bbc12aeec 100644 --- a/apps/ciphers.c +++ b/apps/ciphers.c @@ -27,7 +27,7 @@ typedef enum OPTION_choice { OPT_PSK, OPT_SRP, OPT_CIPHERSUITES, - OPT_V, OPT_UPPER_V, OPT_S + OPT_V, OPT_UPPER_V, OPT_S, OPT_PROV_ENUM } OPTION_CHOICE; const OPTIONS ciphers_options[] = { @@ -67,6 +67,7 @@ const OPTIONS ciphers_options[] = { #endif {"ciphersuites", OPT_CIPHERSUITES, 's', "Configure the TLSv1.3 ciphersuites to use"}, + OPT_PROV_OPTIONS, OPT_PARAMETERS(), {"cipher", 0, 0, "Cipher string to decode (optional)"}, @@ -169,6 +170,10 @@ int ciphers_main(int argc, char **argv) case OPT_CIPHERSUITES: ciphersuites = opt_arg(); break; + case OPT_PROV_CASES: + if (!opt_provider(o)) + goto end; + break; } } argv = opt_rest(); |