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/s_time.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/s_time.c')
-rw-r--r-- | apps/s_time.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/s_time.c b/apps/s_time.c index babbdbe13e..28e82f7cae 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -48,7 +48,8 @@ typedef enum OPTION_choice { OPT_CAPATH, OPT_CAFILE, OPT_CASTORE, OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE, OPT_NEW, OPT_REUSE, OPT_BUGS, OPT_VERIFY, OPT_TIME, OPT_SSL3, - OPT_WWW, OPT_TLS1, OPT_TLS1_1, OPT_TLS1_2, OPT_TLS1_3 + OPT_WWW, OPT_TLS1, OPT_TLS1_1, OPT_TLS1_2, OPT_TLS1_3, + OPT_PROV_ENUM } OPTION_CHOICE; const OPTIONS s_time_options[] = { @@ -99,6 +100,7 @@ const OPTIONS s_time_options[] = { {"no-CAstore", OPT_NOCASTORE, '-', "Do not load certificates from the default certificates store URI"}, + OPT_PROV_OPTIONS, {NULL} }; @@ -226,6 +228,10 @@ int s_time_main(int argc, char **argv) min_version = TLS1_3_VERSION; max_version = TLS1_3_VERSION; break; + case OPT_PROV_CASES: + if (!opt_provider(o)) + goto end; + break; } } argc = opt_num_rest(); |