From 018ef6efe1e20b420eaa3afdaa37b0abeba93a1a Mon Sep 17 00:00:00 2001 From: simon Date: Sat, 29 Jul 2006 19:41:41 +0000 Subject: Upgrade to OpenSSL 0.9.8b. --- secure/usr.bin/openssl/man/s_client.1 | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'secure/usr.bin/openssl/man/s_client.1') diff --git a/secure/usr.bin/openssl/man/s_client.1 b/secure/usr.bin/openssl/man/s_client.1 index 3c1afbc..04b042f 100644 --- a/secure/usr.bin/openssl/man/s_client.1 +++ b/secure/usr.bin/openssl/man/s_client.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14 +.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32 .\" .\" Standard preamble: .\" ======================================================================== @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "S_CLIENT 1" -.TH S_CLIENT 1 "2005-02-25" "0.9.7d" "OpenSSL" +.TH S_CLIENT 1 "2006-07-29" "0.9.8b" "OpenSSL" .SH "NAME" s_client \- SSL/TLS client program .SH "SYNOPSIS" @@ -138,7 +138,10 @@ s_client \- SSL/TLS client program [\fB\-connect host:port\fR] [\fB\-verify depth\fR] [\fB\-cert filename\fR] +[\fB\-certform DER|PEM\fR] [\fB\-key filename\fR] +[\fB\-keyform DER|PEM\fR] +[\fB\-pass arg\fR] [\fB\-CApath directory\fR] [\fB\-CAfile filename\fR] [\fB\-reconnect\fR] @@ -178,10 +181,20 @@ then an attempt is made to connect to the local host on port 4433. .IX Item "-cert certname" The certificate to use, if one is requested by the server. The default is not to use a certificate. +.IP "\fB\-certform format\fR" 4 +.IX Item "-certform format" +The certificate format to use: \s-1DER\s0 or \s-1PEM\s0. \s-1PEM\s0 is the default. .IP "\fB\-key keyfile\fR" 4 .IX Item "-key keyfile" The private key to use. If not specified then the certificate file will be used. +.IP "\fB\-keyform format\fR" 4 +.IX Item "-keyform format" +The private format to use: \s-1DER\s0 or \s-1PEM\s0. \s-1PEM\s0 is the default. +.IP "\fB\-pass arg\fR" 4 +.IX Item "-pass arg" +the private key password source. For more information about the format of \fBarg\fR +see the \fB\s-1PASS\s0 \s-1PHRASE\s0 \s-1ARGUMENTS\s0\fR section in \fIopenssl\fR\|(1). .IP "\fB\-verify depth\fR" 4 .IX Item "-verify depth" The verify depth to use. This specifies the maximum length of the -- cgit v1.1