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/s_server.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/s_server.c')
-rw-r--r-- | apps/s_server.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 69d9e04876..4016270d54 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -757,7 +757,8 @@ typedef enum OPTION_choice { OPT_R_ENUM, OPT_S_ENUM, OPT_V_ENUM, - OPT_X_ENUM + OPT_X_ENUM, + OPT_PROV_ENUM } OPTION_CHOICE; const OPTIONS s_server_options[] = { @@ -992,6 +993,7 @@ const OPTIONS s_server_options[] = { {"chainCAfile", OPT_CHAINCAFILE, '<', "CA file for certificate chain (PEM format)"}, OPT_X_OPTIONS, + OPT_PROV_OPTIONS, {NULL} }; @@ -1566,6 +1568,10 @@ int s_server_main(int argc, char *argv[]) if (!opt_rand(o)) goto end; break; + case OPT_PROV_CASES: + if (!opt_provider(o)) + goto end; + break; case OPT_SERVERNAME: tlsextcbp.servername = opt_arg(); break; |