提交 e986704d 编写于 作者: R Richard Levitte

Add documentation for -starttls (s_client) and -id_prefix (s_server).

PR: 542
上级 ce06265a
...@@ -33,6 +33,7 @@ B<openssl> B<s_client> ...@@ -33,6 +33,7 @@ B<openssl> B<s_client>
[B<-no_tls1>] [B<-no_tls1>]
[B<-bugs>] [B<-bugs>]
[B<-cipher cipherlist>] [B<-cipher cipherlist>]
[B<-starttls protocol>]
[B<-engine id>] [B<-engine id>]
[B<-rand file(s)>] [B<-rand file(s)>]
...@@ -163,6 +164,12 @@ the server determines which cipher suite is used it should take the first ...@@ -163,6 +164,12 @@ the server determines which cipher suite is used it should take the first
supported cipher in the list sent by the client. See the B<ciphers> supported cipher in the list sent by the client. See the B<ciphers>
command for more information. command for more information.
=item B<-starttls protocol>
send the protocol-specific message(s) to switch to TLS for communication.
B<protocol> is a keyword for the intended protocol. Currently, the only
supported keyword is "smtp".
=item B<-engine id> =item B<-engine id>
specifying an engine (by it's unique B<id> string) will cause B<s_client> specifying an engine (by it's unique B<id> string) will cause B<s_client>
......
...@@ -42,6 +42,7 @@ B<openssl> B<s_server> ...@@ -42,6 +42,7 @@ B<openssl> B<s_server>
[B<-WWW>] [B<-WWW>]
[B<-HTTP>] [B<-HTTP>]
[B<-engine id>] [B<-engine id>]
[B<-id_prefix arg>]
[B<-rand file(s)>] [B<-rand file(s)>]
=head1 DESCRIPTION =head1 DESCRIPTION
...@@ -209,6 +210,13 @@ to attempt to obtain a functional reference to the specified engine, ...@@ -209,6 +210,13 @@ to attempt to obtain a functional reference to the specified engine,
thus initialising it if needed. The engine will then be set as the default thus initialising it if needed. The engine will then be set as the default
for all available algorithms. for all available algorithms.
=item B<-id_prefix arg>
generate SSL/TLS session IDs prefixed by B<arg>. This is mostly useful
for testing any SSL/TLS code (eg. proxies) that wish to deal with multiple
servers, when each of which might be generating a unique range of session
IDs (eg. with a certain prefix).
=item B<-rand file(s)> =item B<-rand file(s)>
a file or files containing random data used to seed the random number a file or files containing random data used to seed the random number
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册