From 6bd4e3f231d74578b97821d981d42583fec5c2f3 Mon Sep 17 00:00:00 2001 From: Pauli Date: Tue, 25 Feb 2020 14:29:30 +1000 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/11167) --- apps/ciphers.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'apps/ciphers.c') 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(); -- cgit v1.2.1