PR: 910

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

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 8d19079973a4c7566260f6aa2d917dec92d7f22b..e1e1ba9865d067e2c5034dcf38a744c2e15fe9e7 100644 (file)
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -11,7 +11,10 @@ B<openssl> B<s_client>
 [B<-connect host:port>]
 [B<-verify depth>]
 [B<-cert filename>]
 [B<-connect host:port>]
 [B<-verify depth>]
 [B<-cert filename>]

+[B<-certform DER|PEM>]

 [B<-key filename>]
 [B<-key filename>]

+[B<-keyform DER|PEM>]
+[B<-pass arg>]

 [B<-CApath directory>]
 [B<-CAfile filename>]
 [B<-reconnect>]
 [B<-CApath directory>]
 [B<-CAfile filename>]
 [B<-reconnect>]


@@ -57,11 +60,24 @@ then an attempt is made to connect to the local host on port 4433.
 The certificate to use, if one is requested by the server. The default is
 not to use a certificate.
 
 The certificate to use, if one is requested by the server. The default is
 not to use a certificate.
 

+=item B<-certform format>
+
+The certificate format to use: DER or PEM. PEM is the default.
+

 =item B<-key keyfile>
 
 The private key to use. If not specified then the certificate file will
 be used.
 
 =item B<-key keyfile>
 
 The private key to use. If not specified then the certificate file will
 be used.
 

+=item B<-keyform format>
+
+The private format to use: DER or PEM. PEM is the default.
+
+=item B<-pass arg>
+
+the private key password source. For more information about the format of B<arg>
+see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
+

 =item B<-verify depth>
 
 The verify depth to use. This specifies the maximum length of the
 =item B<-verify depth>
 
 The verify depth to use. This specifies the maximum length of the