diff options
author | Rich Salz <rsalz@akamai.com> | 2020-02-03 16:06:42 -0500 |
---|---|---|
committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2020-02-06 16:46:08 +0100 |
commit | 2a2b1e412534e9cf9b4b13726b0010064f6c729d (patch) | |
tree | c430551310246c9d5f175f2fba1b98788555abba | |
parent | d333c31130bca16f3d3b3ab6c3b674772e95ba0a (diff) |
More accurate doc of -ssl_config option
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/10972)
-rw-r--r-- | apps/s_client.c | 2 | ||||
-rw-r--r-- | doc/man1/openssl-s_client.pod.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index a0668bc927..87fb80afb7 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -614,7 +614,7 @@ const OPTIONS s_client_options[] = { {"ssl_client_engine", OPT_SSL_CLIENT_ENGINE, 's', "Specify engine to be used for client certificate operations"}, #endif - {"ssl_config", OPT_SSL_CONFIG, 's', "Use specified configuration file"}, + {"ssl_config", OPT_SSL_CONFIG, 's', "Use specified section for SSL_CTX configuration"}, #ifndef OPENSSL_NO_CT {"ct", OPT_CT, '-', "Request and parse SCTs (also enables OCSP stapling)"}, {"noct", OPT_NOCT, '-', "Do not request or parse SCTs (default)"}, diff --git a/doc/man1/openssl-s_client.pod.in b/doc/man1/openssl-s_client.pod.in index 712f99c9d8..78a61482ac 100644 --- a/doc/man1/openssl-s_client.pod.in +++ b/doc/man1/openssl-s_client.pod.in @@ -9,7 +9,7 @@ openssl-s_client - SSL/TLS client program B<openssl> B<s_client> [B<-help>] -[B<-ssl_config> I<file>] +[B<-ssl_config> I<section>] [B<-connect> I<host:port>] [B<-host> I<hostname>] [B<-port> I<port>] @@ -154,9 +154,9 @@ manual page. Print out a usage message. -=item B<-ssl_config> I<filename> +=item B<-ssl_config> I<section> -Use the specified configuration file. +Use the specified section of the configuration file to configure the B<SSL_CTX> object. =item B<-connect> I<host>:I<port> |