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)

diff --git a/apps/s_client.c b/apps/s_client.c
index a0668bc927c3129cffa842db6e40b4070822e4f8..87fb80afb7bdda84b1c4c1b214ce04cca3a589c5 100644 (file)
--- 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 712f99c9d8dc4d4dfd77ce6088278edf016bb8f6..78a61482ac7e5d7982f357b4446d184fca2f22ce 100644 (file)
--- 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>