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

[openssl.git] / doc / apps / s_client.pod

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 275e886966e2ef4bc0309af2ab6fe63a7fa852e9..47dc93cb3f799c10629fe4ee9c6b05913e6db48e 100644 (file)
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -18,6 +18,7 @@ B<openssl> B<s_client>
 [B<-pause>]
 [B<-showcerts>]
 [B<-debug>]
 [B<-pause>]
 [B<-showcerts>]
 [B<-debug>]

+[B<-msg>]

 [B<-nbio_test>]
 [B<-state>]
 [B<-nbio>]
 [B<-nbio_test>]
 [B<-state>]
 [B<-nbio>]


@@ -32,6 +33,7 @@ B<openssl> B<s_client>
 [B<-no_tls1>]
 [B<-bugs>]
 [B<-cipher cipherlist>]
 [B<-no_tls1>]
 [B<-bugs>]
 [B<-cipher cipherlist>]

+[B<-starttls protocol>]

 [B<-engine id>]
 [B<-rand file(s)>]
 
 [B<-engine id>]
 [B<-rand file(s)>]
 


@@ -112,6 +114,10 @@ prints out the SSL session states.
 
 print extensive debugging information including a hex dump of all traffic.
 
 
 print extensive debugging information including a hex dump of all traffic.
 

+=item B<-msg>
+
+show all protocol messages with hex dump.
+

 =item B<-nbio_test>
 
 tests non-blocking I/O
 =item B<-nbio_test>
 
 tests non-blocking I/O


@@ -158,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>
 command for more information.
 
 supported cipher in the list sent by the client. See the B<ciphers>
 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>
 
 specifying an engine (by it's unique B<id> string) will cause B<s_client>
 =item B<-engine id>
 
 specifying an engine (by it's unique B<id> string) will cause B<s_client>