Merge OpenSSL 1.0.2m.

47 files changed, 134 insertions, 51 deletions

diff --git a/secure/usr.bin/openssl/Makefile.man b/secure/usr.bin/openssl/Makefile.man
index 86593eda90a0..773bebbcbcf5 100644
--- a/secure/usr.bin/openssl/Makefile.man
+++ b/secure/usr.bin/openssl/Makefile.man
@@ -46,11 +46,18 @@ MAN+= verify.1
 MAN+= version.1
 MAN+= x509.1
 MAN+= x509v3_config.1
+MLINKS+= asn1parse.1 openssl-asn1parse.1
+MLINKS+= ca.1 openssl-ca.1
+MLINKS+= ciphers.1 openssl-ciphers.1
+MLINKS+= cms.1 openssl-cms.1
+MLINKS+= crl.1 openssl-crl.1
+MLINKS+= crl2pkcs7.1 openssl-crl2pkcs7.1
 MLINKS+= dgst.1 dss1.1
 MLINKS+= dgst.1 md2.1
 MLINKS+= dgst.1 md4.1
 MLINKS+= dgst.1 md5.1
 MLINKS+= dgst.1 mdc2.1
+MLINKS+= dgst.1 openssl-dgst.1
 MLINKS+= dgst.1 ripemd160.1
 MLINKS+= dgst.1 sha.1
 MLINKS+= dgst.1 sha1.1
@@ -58,3 +65,38 @@ MLINKS+= dgst.1 sha224.1
 MLINKS+= dgst.1 sha256.1
 MLINKS+= dgst.1 sha384.1
 MLINKS+= dgst.1 sha512.1
+MLINKS+= dhparam.1 openssl-dhparam.1
+MLINKS+= dsa.1 openssl-dsa.1
+MLINKS+= dsaparam.1 openssl-dsaparam.1
+MLINKS+= ec.1 openssl-ec.1
+MLINKS+= ecparam.1 openssl-ecparam.1
+MLINKS+= enc.1 openssl-enc.1
+MLINKS+= errstr.1 openssl-errstr.1
+MLINKS+= gendsa.1 openssl-gendsa.1
+MLINKS+= genpkey.1 openssl-genpkey.1
+MLINKS+= genrsa.1 openssl-genrsa.1
+MLINKS+= nseq.1 openssl-nseq.1
+MLINKS+= ocsp.1 openssl-ocsp.1
+MLINKS+= passwd.1 openssl-passwd.1
+MLINKS+= pkcs12.1 openssl-pkcs12.1
+MLINKS+= pkcs7.1 openssl-pkcs7.1
+MLINKS+= pkcs8.1 openssl-pkcs8.1
+MLINKS+= pkey.1 openssl-pkey.1
+MLINKS+= pkeyparam.1 openssl-pkeyparam.1
+MLINKS+= pkeyutl.1 openssl-pkeyutl.1
+MLINKS+= rand.1 openssl-rand.1
+MLINKS+= req.1 openssl-req.1
+MLINKS+= rsa.1 openssl-rsa.1
+MLINKS+= rsautl.1 openssl-rsautl.1
+MLINKS+= s_client.1 openssl-s_client.1
+MLINKS+= s_server.1 openssl-s_server.1
+MLINKS+= s_time.1 openssl-s_time.1
+MLINKS+= sess_id.1 openssl-sess_id.1
+MLINKS+= smime.1 openssl-smime.1
+MLINKS+= speed.1 openssl-speed.1
+MLINKS+= spkac.1 openssl-spkac.1
+MLINKS+= ts.1 openssl-ts.1
+MLINKS+= tsget.1 openssl-tsget.1
+MLINKS+= verify.1 openssl-verify.1
+MLINKS+= version.1 openssl-version.1
+MLINKS+= x509.1 openssl-x509.1
diff --git a/secure/usr.bin/openssl/man/CA.pl.1 b/secure/usr.bin/openssl/man/CA.pl.1
index b49ba143a860..5e97570d4a39 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 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH CA.PL 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/asn1parse.1 b/secure/usr.bin/openssl/man/asn1parse.1
index b291793ee225..e2eca2a7ce1a 100644
--- a/secure/usr.bin/openssl/man/asn1parse.1
+++ b/secure/usr.bin/openssl/man/asn1parse.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "ASN1PARSE 1"
-.TH ASN1PARSE 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH ASN1PARSE 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-asn1parse,
 asn1parse \- ASN.1 parsing tool
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/c_rehash.1 b/secure/usr.bin/openssl/man/c_rehash.1
index 27b0f4d9e046..37f4cbf804bd 100644
--- a/secure/usr.bin/openssl/man/c_rehash.1
+++ b/secure/usr.bin/openssl/man/c_rehash.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "C_REHASH 1"
-.TH C_REHASH 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH C_REHASH 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/ca.1 b/secure/usr.bin/openssl/man/ca.1
index a5334ce2337d..9eb0f4f55b85 100644
--- a/secure/usr.bin/openssl/man/ca.1
+++ b/secure/usr.bin/openssl/man/ca.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "CA 1"
-.TH CA 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH CA 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-ca,
 ca \- sample minimal CA application
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/ciphers.1 b/secure/usr.bin/openssl/man/ciphers.1
index 28ccf99dd364..50e07c95f8de 100644
--- a/secure/usr.bin/openssl/man/ciphers.1
+++ b/secure/usr.bin/openssl/man/ciphers.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "CIPHERS 1"
-.TH CIPHERS 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH CIPHERS 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-ciphers,
 ciphers \- SSL cipher display and cipher list tool.
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/cms.1 b/secure/usr.bin/openssl/man/cms.1
index fe806c0de702..3e0518afdc0f 100644
--- a/secure/usr.bin/openssl/man/cms.1
+++ b/secure/usr.bin/openssl/man/cms.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS 1"
-.TH CMS 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH CMS 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-cms,
 cms \- CMS utility
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/crl.1 b/secure/usr.bin/openssl/man/crl.1
index 2f7a0dc64afb..91abbce75bed 100644
--- a/secure/usr.bin/openssl/man/crl.1
+++ b/secure/usr.bin/openssl/man/crl.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "CRL 1"
-.TH CRL 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH CRL 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-crl,
 crl \- CRL utility
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/crl2pkcs7.1 b/secure/usr.bin/openssl/man/crl2pkcs7.1
index dcd1d089d5c5..40162ecaee7f 100644
--- a/secure/usr.bin/openssl/man/crl2pkcs7.1
+++ b/secure/usr.bin/openssl/man/crl2pkcs7.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "CRL2PKCS7 1"
-.TH CRL2PKCS7 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH CRL2PKCS7 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-crl2pkcs7,
 crl2pkcs7 \- Create a PKCS#7 structure from a CRL and certificates.
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/dgst.1 b/secure/usr.bin/openssl/man/dgst.1
index 245734326316..928f73010f59 100644
--- a/secure/usr.bin/openssl/man/dgst.1
+++ b/secure/usr.bin/openssl/man/dgst.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "DGST 1"
-.TH DGST 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH DGST 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-dgst,
 dgst, sha, sha1, mdc2, ripemd160, sha224, sha256, sha384, sha512, md2, md4, md5, dss1 \- message digests
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/dhparam.1 b/secure/usr.bin/openssl/man/dhparam.1
index fe78cc4c1964..ec23e33b47ba 100644
--- a/secure/usr.bin/openssl/man/dhparam.1
+++ b/secure/usr.bin/openssl/man/dhparam.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "DHPARAM 1"
-.TH DHPARAM 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH DHPARAM 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-dhparam,
 dhparam \- DH parameter manipulation and generation
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/dsa.1 b/secure/usr.bin/openssl/man/dsa.1
index 1b67f881093c..8b5a9da34f5e 100644
--- a/secure/usr.bin/openssl/man/dsa.1
+++ b/secure/usr.bin/openssl/man/dsa.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA 1"
-.TH DSA 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH DSA 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-dsa,
 dsa \- DSA key processing
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/dsaparam.1 b/secure/usr.bin/openssl/man/dsaparam.1
index b9915878e125..64012bc654e8 100644
--- a/secure/usr.bin/openssl/man/dsaparam.1
+++ b/secure/usr.bin/openssl/man/dsaparam.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "DSAPARAM 1"
-.TH DSAPARAM 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH DSAPARAM 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-dsaparam,
 dsaparam \- DSA parameter manipulation and generation
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/ec.1 b/secure/usr.bin/openssl/man/ec.1
index 7b2dc5330b3d..e14303e0d0cf 100644
--- a/secure/usr.bin/openssl/man/ec.1
+++ b/secure/usr.bin/openssl/man/ec.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "EC 1"
-.TH EC 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH EC 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-ec,
 ec \- EC key processing
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/ecparam.1 b/secure/usr.bin/openssl/man/ecparam.1
index f9ad457d7f81..8e08078de55d 100644
--- a/secure/usr.bin/openssl/man/ecparam.1
+++ b/secure/usr.bin/openssl/man/ecparam.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "ECPARAM 1"
-.TH ECPARAM 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH ECPARAM 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-ecparam,
 ecparam \- EC parameter manipulation and generation
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/enc.1 b/secure/usr.bin/openssl/man/enc.1
index 9eb5bcdb1f57..466a27e33d9f 100644
--- a/secure/usr.bin/openssl/man/enc.1
+++ b/secure/usr.bin/openssl/man/enc.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "ENC 1"
-.TH ENC 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH ENC 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-enc,
 enc \- symmetric cipher routines
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/errstr.1 b/secure/usr.bin/openssl/man/errstr.1
index f51ecfc681dc..4e481a61628e 100644
--- a/secure/usr.bin/openssl/man/errstr.1
+++ b/secure/usr.bin/openssl/man/errstr.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "ERRSTR 1"
-.TH ERRSTR 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH ERRSTR 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-errstr,
 errstr \- lookup error codes
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/gendsa.1 b/secure/usr.bin/openssl/man/gendsa.1
index f90accb42124..9cb9620c1c44 100644
--- a/secure/usr.bin/openssl/man/gendsa.1
+++ b/secure/usr.bin/openssl/man/gendsa.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "GENDSA 1"
-.TH GENDSA 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH GENDSA 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-gendsa,
 gendsa \- generate a DSA private key from a set of parameters
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/genpkey.1 b/secure/usr.bin/openssl/man/genpkey.1
index 005d4f96db00..87b2f9f841da 100644
--- a/secure/usr.bin/openssl/man/genpkey.1
+++ b/secure/usr.bin/openssl/man/genpkey.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "GENPKEY 1"
-.TH GENPKEY 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH GENPKEY 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-genpkey,
 genpkey \- generate a private key
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/genrsa.1 b/secure/usr.bin/openssl/man/genrsa.1
index 43e28c68fa57..ec6a4f12a346 100644
--- a/secure/usr.bin/openssl/man/genrsa.1
+++ b/secure/usr.bin/openssl/man/genrsa.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "GENRSA 1"
-.TH GENRSA 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH GENRSA 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-genrsa,
 genrsa \- generate an RSA private key
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/nseq.1 b/secure/usr.bin/openssl/man/nseq.1
index 6810118c7421..b6c885f2c86c 100644
--- a/secure/usr.bin/openssl/man/nseq.1
+++ b/secure/usr.bin/openssl/man/nseq.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "NSEQ 1"
-.TH NSEQ 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH NSEQ 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-nseq,
 nseq \- create or examine a netscape certificate sequence
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/ocsp.1 b/secure/usr.bin/openssl/man/ocsp.1
index 6a21506e2c88..f2190e33886f 100644
--- a/secure/usr.bin/openssl/man/ocsp.1
+++ b/secure/usr.bin/openssl/man/ocsp.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "OCSP 1"
-.TH OCSP 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH OCSP 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-ocsp,
 ocsp \- Online Certificate Status Protocol utility
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/openssl.1 b/secure/usr.bin/openssl/man/openssl.1
index 89a7ac726d22..b312d29d1955 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 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH OPENSSL 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/passwd.1 b/secure/usr.bin/openssl/man/passwd.1
index 38e1bc3ab9dc..b92a0470b502 100644
--- a/secure/usr.bin/openssl/man/passwd.1
+++ b/secure/usr.bin/openssl/man/passwd.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "PASSWD 1"
-.TH PASSWD 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH PASSWD 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-passwd,
 passwd \- compute password hashes
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/pkcs12.1 b/secure/usr.bin/openssl/man/pkcs12.1
index 34d966cc228e..2ef9cd903468 100644
--- a/secure/usr.bin/openssl/man/pkcs12.1
+++ b/secure/usr.bin/openssl/man/pkcs12.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS12 1"
-.TH PKCS12 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH PKCS12 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-pkcs12,
 pkcs12 \- PKCS#12 file utility
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/pkcs7.1 b/secure/usr.bin/openssl/man/pkcs7.1
index f40c82805bd8..ae2c9872755f 100644
--- a/secure/usr.bin/openssl/man/pkcs7.1
+++ b/secure/usr.bin/openssl/man/pkcs7.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS7 1"
-.TH PKCS7 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH PKCS7 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-pkcs7,
 pkcs7 \- PKCS#7 utility
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/pkcs8.1 b/secure/usr.bin/openssl/man/pkcs8.1
index bef1493598ef..87feb6f4b3c5 100644
--- a/secure/usr.bin/openssl/man/pkcs8.1
+++ b/secure/usr.bin/openssl/man/pkcs8.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS8 1"
-.TH PKCS8 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH PKCS8 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-pkcs8,
 pkcs8 \- PKCS#8 format private key conversion tool
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/pkey.1 b/secure/usr.bin/openssl/man/pkey.1
index 3bbb34fdb0ba..64ae69863b65 100644
--- a/secure/usr.bin/openssl/man/pkey.1
+++ b/secure/usr.bin/openssl/man/pkey.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "PKEY 1"
-.TH PKEY 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH PKEY 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-pkey,
 pkey \- public or private key processing tool
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/pkeyparam.1 b/secure/usr.bin/openssl/man/pkeyparam.1
index 3ce435f55245..f39a927a8b8b 100644
--- a/secure/usr.bin/openssl/man/pkeyparam.1
+++ b/secure/usr.bin/openssl/man/pkeyparam.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "PKEYPARAM 1"
-.TH PKEYPARAM 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH PKEYPARAM 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-pkeyparam,
 pkeyparam \- public key algorithm parameter processing tool
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/pkeyutl.1 b/secure/usr.bin/openssl/man/pkeyutl.1
index bb5936f98754..0b86f13d33a6 100644
--- a/secure/usr.bin/openssl/man/pkeyutl.1
+++ b/secure/usr.bin/openssl/man/pkeyutl.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "PKEYUTL 1"
-.TH PKEYUTL 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH PKEYUTL 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-pkeyutl,
 pkeyutl \- public key algorithm utility
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/rand.1 b/secure/usr.bin/openssl/man/rand.1
index dc5c9a6acdf0..0d4dbee39692 100644
--- a/secure/usr.bin/openssl/man/rand.1
+++ b/secure/usr.bin/openssl/man/rand.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "RAND 1"
-.TH RAND 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH RAND 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-rand,
 rand \- generate pseudo\-random bytes
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/req.1 b/secure/usr.bin/openssl/man/req.1
index 95a2aed483ea..e4d5cce3ce8d 100644
--- a/secure/usr.bin/openssl/man/req.1
+++ b/secure/usr.bin/openssl/man/req.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "REQ 1"
-.TH REQ 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH REQ 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-req,
 req \- PKCS#10 certificate request and certificate generating utility.
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/rsa.1 b/secure/usr.bin/openssl/man/rsa.1
index db7f5557bfeb..3d2ec4cbdef1 100644
--- a/secure/usr.bin/openssl/man/rsa.1
+++ b/secure/usr.bin/openssl/man/rsa.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA 1"
-.TH RSA 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH RSA 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-rsa,
 rsa \- RSA key processing tool
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/rsautl.1 b/secure/usr.bin/openssl/man/rsautl.1
index 4a2a4c85dec4..0835f3677837 100644
--- a/secure/usr.bin/openssl/man/rsautl.1
+++ b/secure/usr.bin/openssl/man/rsautl.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "RSAUTL 1"
-.TH RSAUTL 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH RSAUTL 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-rsautl,
 rsautl \- RSA utility
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
@@ -223,7 +224,7 @@ Recover the signed data
 Examine the raw signed data:
 .PP
 .Vb 1
-\& openssl rsautl \-verify \-in file \-inkey key.pem \-raw \-hexdump
+\& openssl rsautl \-verify \-in sig \-inkey key.pem \-raw \-hexdump
 \&
 \& 0000 \- 00 01 ff ff ff ff ff ff\-ff ff ff ff ff ff ff ff   ................
 \& 0010 \- ff ff ff ff ff ff ff ff\-ff ff ff ff ff ff ff ff   ................
diff --git a/secure/usr.bin/openssl/man/s_client.1 b/secure/usr.bin/openssl/man/s_client.1
index a0f9f8ea2909..4a5c77476d6a 100644
--- a/secure/usr.bin/openssl/man/s_client.1
+++ b/secure/usr.bin/openssl/man/s_client.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "S_CLIENT 1"
-.TH S_CLIENT 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH S_CLIENT 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-s_client,
 s_client \- SSL/TLS client program
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
@@ -299,11 +300,13 @@ Can be used to override the implicit \fB\-ign_eof\fR after \fB\-quiet\fR.
 .IP "\fB\-psk_identity identity\fR" 4
 .IX Item "-psk_identity identity"
 Use the \s-1PSK\s0 identity \fBidentity\fR when using a \s-1PSK\s0 cipher suite.
+The default value is \*(L"Client_identity\*(R" (without the quotes).
 .IP "\fB\-psk key\fR" 4
 .IX Item "-psk key"
 Use the \s-1PSK\s0 key \fBkey\fR when using a \s-1PSK\s0 cipher suite. The key is
 given as a hexadecimal number without leading 0x, for example \-psk
 1a2b3c4d.
+This option must be provided in order to use a \s-1PSK\s0 cipher.
 .IP "\fB\-ssl2\fR, \fB\-ssl3\fR, \fB\-tls1\fR, \fB\-tls1_1\fR, \fB\-tls1_2\fR, \fB\-no_ssl2\fR, \fB\-no_ssl3\fR, \fB\-no_tls1\fR, \fB\-no_tls1_1\fR, \fB\-no_tls1_2\fR" 4
 .IX Item "-ssl2, -ssl3, -tls1, -tls1_1, -tls1_2, -no_ssl2, -no_ssl3, -no_tls1, -no_tls1_1, -no_tls1_2"
 These options require or disable the use of the specified \s-1SSL\s0 or \s-1TLS\s0 protocols.
diff --git a/secure/usr.bin/openssl/man/s_server.1 b/secure/usr.bin/openssl/man/s_server.1
index f7617cc8950d..d9820c472f1f 100644
--- a/secure/usr.bin/openssl/man/s_server.1
+++ b/secure/usr.bin/openssl/man/s_server.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "S_SERVER 1"
-.TH S_SERVER 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH S_SERVER 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-s_server,
 s_server \- SSL/TLS server program
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
@@ -320,6 +321,7 @@ Use the \s-1PSK\s0 identity hint \fBhint\fR when using a \s-1PSK\s0 cipher suite
 Use the \s-1PSK\s0 key \fBkey\fR when using a \s-1PSK\s0 cipher suite. The key is
 given as a hexadecimal number without leading 0x, for example \-psk
 1a2b3c4d.
+This option must be provided in order to use a \s-1PSK\s0 cipher.
 .IP "\fB\-ssl2\fR, \fB\-ssl3\fR, \fB\-tls1\fR, \fB\-tls1_1\fR, \fB\-tls1_2\fR, \fB\-no_ssl2\fR, \fB\-no_ssl3\fR, \fB\-no_tls1\fR, \fB\-no_tls1_1\fR, \fB\-no_tls1_2\fR" 4
 .IX Item "-ssl2, -ssl3, -tls1, -tls1_1, -tls1_2, -no_ssl2, -no_ssl3, -no_tls1, -no_tls1_1, -no_tls1_2"
 These options require or disable the use of the specified \s-1SSL\s0 or \s-1TLS\s0 protocols.
@@ -472,10 +474,6 @@ a web browser the command:
 .PP
 can be used for example.
 .PP
-Most web browsers (in particular Netscape and \s-1MSIE\s0) only support \s-1RSA\s0 cipher
-suites, so they cannot connect to servers which don't use a certificate
-carrying an \s-1RSA\s0 key or a version of OpenSSL with \s-1RSA\s0 disabled.
-.PP
 Although specifying an empty list of CAs when requesting a client certificate
 is strictly speaking a protocol violation, some \s-1SSL\s0 clients interpret this to
 mean any \s-1CA\s0 is acceptable. This is useful for debugging purposes.
diff --git a/secure/usr.bin/openssl/man/s_time.1 b/secure/usr.bin/openssl/man/s_time.1
index 81a42a1a2d25..e6db1f8c2411 100644
--- a/secure/usr.bin/openssl/man/s_time.1
+++ b/secure/usr.bin/openssl/man/s_time.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "S_TIME 1"
-.TH S_TIME 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH S_TIME 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-s_time,
 s_time \- SSL/TLS performance timing program
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/sess_id.1 b/secure/usr.bin/openssl/man/sess_id.1
index af9b21e99b70..8644632280f8 100644
--- a/secure/usr.bin/openssl/man/sess_id.1
+++ b/secure/usr.bin/openssl/man/sess_id.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "SESS_ID 1"
-.TH SESS_ID 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH SESS_ID 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-sess_id,
 sess_id \- SSL/TLS session handling utility
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/smime.1 b/secure/usr.bin/openssl/man/smime.1
index f9672f805ef5..3a59bec0b7df 100644
--- a/secure/usr.bin/openssl/man/smime.1
+++ b/secure/usr.bin/openssl/man/smime.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "SMIME 1"
-.TH SMIME 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH SMIME 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-smime,
 smime \- S/MIME utility
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/speed.1 b/secure/usr.bin/openssl/man/speed.1
index 73bccfa9e0ca..d410e8f6f251 100644
--- a/secure/usr.bin/openssl/man/speed.1
+++ b/secure/usr.bin/openssl/man/speed.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "SPEED 1"
-.TH SPEED 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH SPEED 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-speed,
 speed \- test library performance
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/spkac.1 b/secure/usr.bin/openssl/man/spkac.1
index edba455b0b8a..12afc8820a42 100644
--- a/secure/usr.bin/openssl/man/spkac.1
+++ b/secure/usr.bin/openssl/man/spkac.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "SPKAC 1"
-.TH SPKAC 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH SPKAC 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-spkac,
 spkac \- SPKAC printing and generating utility
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/ts.1 b/secure/usr.bin/openssl/man/ts.1
index 89ce9088d22f..636d405ab420 100644
--- a/secure/usr.bin/openssl/man/ts.1
+++ b/secure/usr.bin/openssl/man/ts.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "TS 1"
-.TH TS 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH TS 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-ts,
 ts \- Time Stamping Authority tool (client/server)
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/tsget.1 b/secure/usr.bin/openssl/man/tsget.1
index 77a38d00f431..7127e5d2bc43 100644
--- a/secure/usr.bin/openssl/man/tsget.1
+++ b/secure/usr.bin/openssl/man/tsget.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "TSGET 1"
-.TH TSGET 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH TSGET 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-tsget,
 tsget \- Time Stamping HTTP/HTTPS client
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/verify.1 b/secure/usr.bin/openssl/man/verify.1
index aa939300b17a..4f65f99b7e84 100644
--- a/secure/usr.bin/openssl/man/verify.1
+++ b/secure/usr.bin/openssl/man/verify.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "VERIFY 1"
-.TH VERIFY 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH VERIFY 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-verify,
 verify \- Utility to verify certificates.
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/version.1 b/secure/usr.bin/openssl/man/version.1
index a545563c0b1a..27de32704043 100644
--- a/secure/usr.bin/openssl/man/version.1
+++ b/secure/usr.bin/openssl/man/version.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "VERSION 1"
-.TH VERSION 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH VERSION 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-version,
 version \- print OpenSSL version information
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/x509.1 b/secure/usr.bin/openssl/man/x509.1
index 8869ce28a559..09e67adfbfcf 100644
--- a/secure/usr.bin/openssl/man/x509.1
+++ b/secure/usr.bin/openssl/man/x509.1
@@ -129,12 +129,13 @@
 .\" ========================================================================
 .\"
 .IX Title "X509 1"
-.TH X509 1 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH X509 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
+openssl\-x509,
 x509 \- Certificate display and signing utility
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff --git a/secure/usr.bin/openssl/man/x509v3_config.1 b/secure/usr.bin/openssl/man/x509v3_config.1
index 0458496062b9..2aab3ef029a6 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 "2017-05-25" "1.0.2l" "OpenSSL"
+.TH X509V3_CONFIG 1 "2017-11-02" "1.0.2m" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l