提交 2a2b1e41 编写于 作者: R Rich Salz 提交者: Dr. Matthias St. Pierre

More accurate doc of -ssl_config option

Reviewed-by: NMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: NDmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/10972)
上级 d333c311
...@@ -614,7 +614,7 @@ const OPTIONS s_client_options[] = { ...@@ -614,7 +614,7 @@ const OPTIONS s_client_options[] = {
{"ssl_client_engine", OPT_SSL_CLIENT_ENGINE, 's', {"ssl_client_engine", OPT_SSL_CLIENT_ENGINE, 's',
"Specify engine to be used for client certificate operations"}, "Specify engine to be used for client certificate operations"},
#endif #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 #ifndef OPENSSL_NO_CT
{"ct", OPT_CT, '-', "Request and parse SCTs (also enables OCSP stapling)"}, {"ct", OPT_CT, '-', "Request and parse SCTs (also enables OCSP stapling)"},
{"noct", OPT_NOCT, '-', "Do not request or parse SCTs (default)"}, {"noct", OPT_NOCT, '-', "Do not request or parse SCTs (default)"},
......
...@@ -9,7 +9,7 @@ openssl-s_client - SSL/TLS client program ...@@ -9,7 +9,7 @@ openssl-s_client - SSL/TLS client program
B<openssl> B<s_client> B<openssl> B<s_client>
[B<-help>] [B<-help>]
[B<-ssl_config> I<file>] [B<-ssl_config> I<section>]
[B<-connect> I<host:port>] [B<-connect> I<host:port>]
[B<-host> I<hostname>] [B<-host> I<hostname>]
[B<-port> I<port>] [B<-port> I<port>]
...@@ -154,9 +154,9 @@ manual page. ...@@ -154,9 +154,9 @@ manual page.
Print out a usage message. 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> =item B<-connect> I<host>:I<port>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册