Upgrade to OpenSSL 0.9.8d.

38 files changed, 80 insertions, 43 deletions

diff --git a/secure/usr.bin/openssl/man/CA.pl.1 b/secure/usr.bin/openssl/man/CA.pl.1
index a8f74cb2a345..cd3b602963de 100644
--- a/secure/usr.bin/openssl/man/CA.pl.1
+++ b/secure/usr.bin/openssl/man/CA.pl.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CA.PL 1"
-.TH CA.PL 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH CA.PL 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 CA.pl \- friendlier interface for OpenSSL certificate programs
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/asn1parse.1 b/secure/usr.bin/openssl/man/asn1parse.1
index f9cabeaa2409..b297e937337d 100644
--- a/secure/usr.bin/openssl/man/asn1parse.1
+++ b/secure/usr.bin/openssl/man/asn1parse.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ASN1PARSE 1"
-.TH ASN1PARSE 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH ASN1PARSE 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 asn1parse \- ASN.1 parsing tool
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/ca.1 b/secure/usr.bin/openssl/man/ca.1
index 528f1d78176d..f0bb6e6bb2c9 100644
--- a/secure/usr.bin/openssl/man/ca.1
+++ b/secure/usr.bin/openssl/man/ca.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CA 1"
-.TH CA 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH CA 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 ca \- sample minimal CA application
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/ciphers.1 b/secure/usr.bin/openssl/man/ciphers.1
index bf3310352837..e1fe9d29df7b 100644
--- a/secure/usr.bin/openssl/man/ciphers.1
+++ b/secure/usr.bin/openssl/man/ciphers.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CIPHERS 1"
-.TH CIPHERS 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH CIPHERS 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 ciphers \- SSL cipher display and cipher list tool.
 .SH "SYNOPSIS"
@@ -233,10 +233,10 @@ the cipher suites not enabled by \fB\s-1ALL\s0\fR, currently being \fBeNULL\fR.
 .IP "\fB\s-1HIGH\s0\fR" 4
 .IX Item "HIGH"
 \&\*(L"high\*(R" encryption cipher suites. This currently means those with key lengths larger
-than 128 bits.
+than 128 bits, and some cipher suites with 128\-bit keys.
 .IP "\fB\s-1MEDIUM\s0\fR" 4
 .IX Item "MEDIUM"
-\&\*(L"medium\*(R" encryption cipher suites, currently those using 128 bit encryption.
+\&\*(L"medium\*(R" encryption cipher suites, currently some of those using 128 bit encryption.
 .IP "\fB\s-1LOW\s0\fR" 4
 .IX Item "LOW"
 \&\*(L"low\*(R" encryption cipher suites, currently those using 64 or 56 bit encryption algorithms
@@ -317,6 +317,9 @@ cipher suites using \s-1MD5\s0.
 .IP "\fB\s-1SHA1\s0\fR, \fB\s-1SHA\s0\fR" 4
 .IX Item "SHA1, SHA"
 cipher suites using \s-1SHA1\s0.
+.IP "\fBCamellia\fR" 4
+.IX Item "Camellia"
+cipher suites using Camellia.
 .SH "CIPHER SUITE NAMES"
 .IX Header "CIPHER SUITE NAMES"
 The following lists give the \s-1SSL\s0 or \s-1TLS\s0 cipher suites names from the
@@ -428,6 +431,31 @@ e.g. \s-1DES\-CBC3\-SHA\s0. In these cases, \s-1RSA\s0 authentication is used.
 \& TLS_DH_anon_WITH_AES_128_CBC_SHA        ADH-AES128-SHA
 \& TLS_DH_anon_WITH_AES_256_CBC_SHA        ADH-AES256-SHA
 .Ve
+.Sh "Camellia ciphersuites from \s-1RFC4132\s0, extending \s-1TLS\s0 v1.0"
+.IX Subsection "Camellia ciphersuites from RFC4132, extending TLS v1.0"
+.Vb 2
+\& TLS_RSA_WITH_CAMELLIA_128_CBC_SHA      CAMELLIA128-SHA
+\& TLS_RSA_WITH_CAMELLIA_256_CBC_SHA      CAMELLIA256-SHA
+.Ve
+.PP
+.Vb 4
+\& TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA   Not implemented.
+\& TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA   Not implemented.
+\& TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA   Not implemented.
+\& TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA   Not implemented.
+.Ve
+.PP
+.Vb 4
+\& TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA  DHE-DSS-CAMELLIA128-SHA
+\& TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA  DHE-DSS-CAMELLIA256-SHA
+\& TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA  DHE-RSA-CAMELLIA128-SHA
+\& TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA  DHE-RSA-CAMELLIA256-SHA
+.Ve
+.PP
+.Vb 2
+\& TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA  ADH-CAMELLIA128-SHA
+\& TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA  ADH-CAMELLIA256-SHA
+.Ve
 .Sh "Additional Export 1024 and other cipher suites"
 .IX Subsection "Additional Export 1024 and other cipher suites"
 Note: these ciphers can also be used in \s-1SSL\s0 v3.
diff --git a/secure/usr.bin/openssl/man/crl.1 b/secure/usr.bin/openssl/man/crl.1
index 54766011129f..db1411913853 100644
--- a/secure/usr.bin/openssl/man/crl.1
+++ b/secure/usr.bin/openssl/man/crl.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CRL 1"
-.TH CRL 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH CRL 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 crl \- CRL utility
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/crl2pkcs7.1 b/secure/usr.bin/openssl/man/crl2pkcs7.1
index 49bb3e4051eb..415acc19fb4e 100644
--- a/secure/usr.bin/openssl/man/crl2pkcs7.1
+++ b/secure/usr.bin/openssl/man/crl2pkcs7.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CRL2PKCS7 1"
-.TH CRL2PKCS7 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH CRL2PKCS7 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 crl2pkcs7 \- Create a PKCS#7 structure from a CRL and certificates.
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/dgst.1 b/secure/usr.bin/openssl/man/dgst.1
index 2db68aa78011..17f2e51cf664 100644
--- a/secure/usr.bin/openssl/man/dgst.1
+++ b/secure/usr.bin/openssl/man/dgst.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DGST 1"
-.TH DGST 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH DGST 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 dgst, md5, md4, md2, sha1, sha, mdc2, ripemd160 \- message digests
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/dhparam.1 b/secure/usr.bin/openssl/man/dhparam.1
index 2f211fbab84e..af0cc10f2e67 100644
--- a/secure/usr.bin/openssl/man/dhparam.1
+++ b/secure/usr.bin/openssl/man/dhparam.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DHPARAM 1"
-.TH DHPARAM 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH DHPARAM 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 dhparam \- DH parameter manipulation and generation
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/dsa.1 b/secure/usr.bin/openssl/man/dsa.1
index 60ed53d2aecb..7ad50753661c 100644
--- a/secure/usr.bin/openssl/man/dsa.1
+++ b/secure/usr.bin/openssl/man/dsa.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA 1"
-.TH DSA 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH DSA 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 dsa \- DSA key processing
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/dsaparam.1 b/secure/usr.bin/openssl/man/dsaparam.1
index 894f572393df..abf4d1d503ad 100644
--- a/secure/usr.bin/openssl/man/dsaparam.1
+++ b/secure/usr.bin/openssl/man/dsaparam.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSAPARAM 1"
-.TH DSAPARAM 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH DSAPARAM 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 dsaparam \- DSA parameter manipulation and generation
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/ec.1 b/secure/usr.bin/openssl/man/ec.1
index 668866937966..1403843617be 100644
--- a/secure/usr.bin/openssl/man/ec.1
+++ b/secure/usr.bin/openssl/man/ec.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EC 1"
-.TH EC 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH EC 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 ec \- EC key processing
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/ecparam.1 b/secure/usr.bin/openssl/man/ecparam.1
index 7f7e8478a34b..53b5461cd6a5 100644
--- a/secure/usr.bin/openssl/man/ecparam.1
+++ b/secure/usr.bin/openssl/man/ecparam.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ECPARAM 1"
-.TH ECPARAM 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH ECPARAM 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 ecparam \- EC parameter manipulation and generation
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/enc.1 b/secure/usr.bin/openssl/man/enc.1
index 61eaedd4e5ea..c9fb389b0747 100644
--- a/secure/usr.bin/openssl/man/enc.1
+++ b/secure/usr.bin/openssl/man/enc.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ENC 1"
-.TH ENC 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH ENC 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 enc \- symmetric cipher routines
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/errstr.1 b/secure/usr.bin/openssl/man/errstr.1
index a2cc57145a17..9eca562be1a7 100644
--- a/secure/usr.bin/openssl/man/errstr.1
+++ b/secure/usr.bin/openssl/man/errstr.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERRSTR 1"
-.TH ERRSTR 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH ERRSTR 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 errstr \- lookup error codes
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/gendsa.1 b/secure/usr.bin/openssl/man/gendsa.1
index 2c5bd5441c2a..20cc8383c88e 100644
--- a/secure/usr.bin/openssl/man/gendsa.1
+++ b/secure/usr.bin/openssl/man/gendsa.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GENDSA 1"
-.TH GENDSA 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH GENDSA 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 gendsa \- generate a DSA private key from a set of parameters
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/genrsa.1 b/secure/usr.bin/openssl/man/genrsa.1
index 41e32c17548e..43d2eb8739ff 100644
--- a/secure/usr.bin/openssl/man/genrsa.1
+++ b/secure/usr.bin/openssl/man/genrsa.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GENRSA 1"
-.TH GENRSA 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH GENRSA 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 genrsa \- generate an RSA private key
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/nseq.1 b/secure/usr.bin/openssl/man/nseq.1
index 7737e485a9bc..8444df4b9da8 100644
--- a/secure/usr.bin/openssl/man/nseq.1
+++ b/secure/usr.bin/openssl/man/nseq.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "NSEQ 1"
-.TH NSEQ 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH NSEQ 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 nseq \- create or examine a netscape certificate sequence
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/ocsp.1 b/secure/usr.bin/openssl/man/ocsp.1
index 14f15cec5f1e..d02f019119d9 100644
--- a/secure/usr.bin/openssl/man/ocsp.1
+++ b/secure/usr.bin/openssl/man/ocsp.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OCSP 1"
-.TH OCSP 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH OCSP 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 ocsp \- Online Certificate Status Protocol utility
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/openssl.1 b/secure/usr.bin/openssl/man/openssl.1
index 55ef87e17824..25fd6b933963 100644
--- a/secure/usr.bin/openssl/man/openssl.1
+++ b/secure/usr.bin/openssl/man/openssl.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OPENSSL 1"
-.TH OPENSSL 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH OPENSSL 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 openssl \- OpenSSL command line tool
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/passwd.1 b/secure/usr.bin/openssl/man/passwd.1
index 63c35de2fab2..f28865d9aca9 100644
--- a/secure/usr.bin/openssl/man/passwd.1
+++ b/secure/usr.bin/openssl/man/passwd.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PASSWD 1"
-.TH PASSWD 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH PASSWD 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 passwd \- compute password hashes
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/pkcs12.1 b/secure/usr.bin/openssl/man/pkcs12.1
index 16486403bd5a..619ebb193def 100644
--- a/secure/usr.bin/openssl/man/pkcs12.1
+++ b/secure/usr.bin/openssl/man/pkcs12.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS12 1"
-.TH PKCS12 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH PKCS12 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 pkcs12 \- PKCS#12 file utility
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/pkcs7.1 b/secure/usr.bin/openssl/man/pkcs7.1
index 72bf255c0589..c420b3792758 100644
--- a/secure/usr.bin/openssl/man/pkcs7.1
+++ b/secure/usr.bin/openssl/man/pkcs7.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS7 1"
-.TH PKCS7 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH PKCS7 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 pkcs7 \- PKCS#7 utility
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/pkcs8.1 b/secure/usr.bin/openssl/man/pkcs8.1
index 3ebc833cb1ff..2800d0b9e5bf 100644
--- a/secure/usr.bin/openssl/man/pkcs8.1
+++ b/secure/usr.bin/openssl/man/pkcs8.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS8 1"
-.TH PKCS8 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH PKCS8 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 pkcs8 \- PKCS#8 format private key conversion tool
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/rand.1 b/secure/usr.bin/openssl/man/rand.1
index 9bc63033bee0..67bfdb507214 100644
--- a/secure/usr.bin/openssl/man/rand.1
+++ b/secure/usr.bin/openssl/man/rand.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RAND 1"
-.TH RAND 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH RAND 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 rand \- generate pseudo\-random bytes
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/req.1 b/secure/usr.bin/openssl/man/req.1
index 031e81df6465..ac37037f9d52 100644
--- a/secure/usr.bin/openssl/man/req.1
+++ b/secure/usr.bin/openssl/man/req.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "REQ 1"
-.TH REQ 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH REQ 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 req \- PKCS#10 certificate request and certificate generating utility.
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/rsa.1 b/secure/usr.bin/openssl/man/rsa.1
index 717db817b87d..ed8d6daaad85 100644
--- a/secure/usr.bin/openssl/man/rsa.1
+++ b/secure/usr.bin/openssl/man/rsa.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA 1"
-.TH RSA 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH RSA 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 rsa \- RSA key processing tool
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/rsautl.1 b/secure/usr.bin/openssl/man/rsautl.1
index 5d1541b2771b..8b24e1d91cbc 100644
--- a/secure/usr.bin/openssl/man/rsautl.1
+++ b/secure/usr.bin/openssl/man/rsautl.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSAUTL 1"
-.TH RSAUTL 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH RSAUTL 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 rsautl \- RSA utility
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/s_client.1 b/secure/usr.bin/openssl/man/s_client.1
index 04b042f81f1e..afb7a15414ef 100644
--- a/secure/usr.bin/openssl/man/s_client.1
+++ b/secure/usr.bin/openssl/man/s_client.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "S_CLIENT 1"
-.TH S_CLIENT 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH S_CLIENT 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 s_client \- SSL/TLS client program
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/s_server.1 b/secure/usr.bin/openssl/man/s_server.1
index 0e17647b5f17..5d1fb1a01f7a 100644
--- a/secure/usr.bin/openssl/man/s_server.1
+++ b/secure/usr.bin/openssl/man/s_server.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "S_SERVER 1"
-.TH S_SERVER 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH S_SERVER 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 s_server \- SSL/TLS server program
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/s_time.1 b/secure/usr.bin/openssl/man/s_time.1
index 60ac6e28e4b4..4b7c3a0cf4a7 100644
--- a/secure/usr.bin/openssl/man/s_time.1
+++ b/secure/usr.bin/openssl/man/s_time.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "S_TIME 1"
-.TH S_TIME 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH S_TIME 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 s_time \- SSL/TLS performance timing program
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/sess_id.1 b/secure/usr.bin/openssl/man/sess_id.1
index c71a12837454..697a01fb9b45 100644
--- a/secure/usr.bin/openssl/man/sess_id.1
+++ b/secure/usr.bin/openssl/man/sess_id.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SESS_ID 1"
-.TH SESS_ID 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH SESS_ID 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 sess_id \- SSL/TLS session handling utility
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/smime.1 b/secure/usr.bin/openssl/man/smime.1
index c283c7316b11..0d6b4e26227f 100644
--- a/secure/usr.bin/openssl/man/smime.1
+++ b/secure/usr.bin/openssl/man/smime.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SMIME 1"
-.TH SMIME 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH SMIME 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 smime \- S/MIME utility
 .SH "SYNOPSIS"
@@ -148,6 +148,9 @@ smime \- S/MIME utility
 [\fB\-aes128\fR]
 [\fB\-aes192\fR]
 [\fB\-aes256\fR]
+[\fB\-camellia128\fR]
+[\fB\-camellia192\fR]
+[\fB\-camellia256\fR]
 [\fB\-in file\fR]
 [\fB\-certfile file\fR]
 [\fB\-signer file\fR]
@@ -239,10 +242,10 @@ a directory containing trusted \s-1CA\s0 certificates, only used with
 \&\fB\-verify\fR. This directory must be a standard certificate directory: that
 is a hash of each subject name (using \fBx509 \-hash\fR) should be linked
 to each certificate.
-.IP "\fB\-des \-des3 \-rc2\-40 \-rc2\-64 \-rc2\-128 \-aes128 \-aes192 \-aes256\fR" 4
-.IX Item "-des -des3 -rc2-40 -rc2-64 -rc2-128 -aes128 -aes192 -aes256"
+.IP "\fB\-des \-des3 \-rc2\-40 \-rc2\-64 \-rc2\-128 \-aes128 \-aes192 \-aes256 \-camellia128 \-camellia192 \-camellia256\fR" 4
+.IX Item "-des -des3 -rc2-40 -rc2-64 -rc2-128 -aes128 -aes192 -aes256 -camellia128 -camellia192 -camellia256"
 the encryption algorithm to use. \s-1DES\s0 (56 bits), triple \s-1DES\s0 (168 bits),
-40, 64 or 128 bit \s-1RC2\s0 or 128, 192 or 256 bit \s-1AES\s0 respectively.  If not
+40, 64 or 128 bit \s-1RC2\s0, 128, 192 or 256 bit \s-1AES\s0, or 128, 192 or 256 bit Camellia respectively.  If not
 specified 40 bit \s-1RC2\s0 is used. Only used with \fB\-encrypt\fR.
 .IP "\fB\-nointern\fR" 4
 .IX Item "-nointern"
@@ -454,6 +457,12 @@ alternatively you can base64 decode the signature and use
 .Vb 1
 \& openssl smime -verify -inform DER -in signature.der -content content.txt
 .Ve
+.PP
+Create an encrypted message using 128 bit Camellia:
+.PP
+.Vb 1
+\& openssl smime -encrypt -in plain.txt -camellia128 -out mail.msg cert.pem
+.Ve
 .SH "BUGS"
 .IX Header "BUGS"
 The \s-1MIME\s0 parser isn't very clever: it seems to handle most messages that I've thrown
diff --git a/secure/usr.bin/openssl/man/speed.1 b/secure/usr.bin/openssl/man/speed.1
index 841ea5c28719..dca6cdd85d34 100644
--- a/secure/usr.bin/openssl/man/speed.1
+++ b/secure/usr.bin/openssl/man/speed.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SPEED 1"
-.TH SPEED 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH SPEED 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 speed \- test library performance
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/spkac.1 b/secure/usr.bin/openssl/man/spkac.1
index 60691e3a69da..fa7c63d40809 100644
--- a/secure/usr.bin/openssl/man/spkac.1
+++ b/secure/usr.bin/openssl/man/spkac.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SPKAC 1"
-.TH SPKAC 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH SPKAC 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 spkac \- SPKAC printing and generating utility
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/verify.1 b/secure/usr.bin/openssl/man/verify.1
index 3fc0cfe763ec..e408984f5bf1 100644
--- a/secure/usr.bin/openssl/man/verify.1
+++ b/secure/usr.bin/openssl/man/verify.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "VERIFY 1"
-.TH VERIFY 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH VERIFY 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 verify \- Utility to verify certificates.
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/version.1 b/secure/usr.bin/openssl/man/version.1
index 87b840e8bbe0..5d15b940c38e 100644
--- a/secure/usr.bin/openssl/man/version.1
+++ b/secure/usr.bin/openssl/man/version.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "VERSION 1"
-.TH VERSION 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH VERSION 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 version \- print OpenSSL version information
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/x509.1 b/secure/usr.bin/openssl/man/x509.1
index a798d1fdaf8b..23d8de6e5578 100644
--- a/secure/usr.bin/openssl/man/x509.1
+++ b/secure/usr.bin/openssl/man/x509.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509 1"
-.TH X509 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH X509 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 x509 \- Certificate display and signing utility
 .SH "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/x509v3_config.1 b/secure/usr.bin/openssl/man/x509v3_config.1
index c97538c95163..22b3e825cf22 100644
--- a/secure/usr.bin/openssl/man/x509v3_config.1
+++ b/secure/usr.bin/openssl/man/x509v3_config.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509V3_CONFIG 1"
-.TH X509V3_CONFIG 1 "2006-07-29" "0.9.8b" "OpenSSL"
+.TH X509V3_CONFIG 1 "2006-10-01" "0.9.8d" "OpenSSL"
 .SH "NAME"
 x509v3_config \- X509 V3 certificate extension configuration format
 .SH "DESCRIPTION"