Upgrade to OpenSSL 0.9.8b.

1 files changed, 21 insertions, 2 deletions

diff --git a/secure/usr.bin/openssl/man/s_server.1 b/secure/usr.bin/openssl/man/s_server.1
index 79d774f..0e17647 100644
--- a/secure/usr.bin/openssl/man/s_server.1
+++ b/secure/usr.bin/openssl/man/s_server.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_SERVER 1"
-.TH S_SERVER 1 "2005-02-25" "0.9.7d" "OpenSSL"
+.TH S_SERVER 1 "2006-07-29" "0.9.8b" "OpenSSL"
 .SH "NAME"
 s_server \- SSL/TLS server program
 .SH "SYNOPSIS"
@@ -140,9 +140,15 @@ s_server \- SSL/TLS server program
 [\fB\-verify depth\fR]
 [\fB\-Verify depth\fR]
 [\fB\-cert filename\fR]
+[\fB\-certform DER|PEM\fR]
 [\fB\-key keyfile\fR]
+[\fB\-keyform DER|PEM\fR]
+[\fB\-pass arg\fR]
 [\fB\-dcert filename\fR]
+[\fB\-dcertform DER|PEM\fR]
 [\fB\-dkey keyfile\fR]
+[\fB\-dkeyform DER|PEM\fR]
+[\fB\-dpass arg\fR]
 [\fB\-dhparam filename\fR]
 [\fB\-nbio\fR]
 [\fB\-nbio_test\fR]
@@ -190,10 +196,20 @@ The certificate to use, most servers cipher suites require the use of a
 certificate and some require a certificate with a certain public key type:
 for example the \s-1DSS\s0 cipher suites require a certificate containing a \s-1DSS\s0
 (\s-1DSA\s0) key. If not specified then the filename \*(L"server.pem\*(R" will be used.
+.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\-dcert filename\fR, \fB\-dkey keyname\fR" 4
 .IX Item "-dcert filename, -dkey keyname"
 specify an additional certificate and private key, these behave in the
@@ -204,6 +220,9 @@ a certain type. Some cipher suites need a certificate carrying an \s-1RSA\s0 key
 and some a \s-1DSS\s0 (\s-1DSA\s0) key. By using \s-1RSA\s0 and \s-1DSS\s0 certificates and keys
 a server can support clients which only support \s-1RSA\s0 or \s-1DSS\s0 cipher suites
 by using an appropriate certificate.
+.IP "\fB\-dcertform format\fR, \fB\-dkeyform format\fR, \fB\-dpass arg\fR" 4
+.IX Item "-dcertform format, -dkeyform format, -dpass arg"
+addtional certificate and private key format and passphrase respectively.
 .IP "\fB\-nocert\fR" 4
 .IX Item "-nocert"
 if this option is set then no certificate is used. This restricts the