===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/openssl.1,v
retrieving revision 1.113
retrieving revision 1.114
diff -c -r1.113 -r1.114
*** src/usr.bin/openssl/openssl.1	2019/08/05 12:01:51	1.113
--- src/usr.bin/openssl/openssl.1	2019/10/04 06:22:51	1.114
***************
*** 1,4 ****
! .\" $OpenBSD: openssl.1,v 1.113 2019/08/05 12:01:51 inoguchi Exp $
  .\" ====================================================================
  .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  .\"
--- 1,4 ----
! .\" $OpenBSD: openssl.1,v 1.114 2019/10/04 06:22:51 jmc Exp $
  .\" ====================================================================
  .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  .\"
***************
*** 110,116 ****
  .\" copied and put under another distribution licence
  .\" [including the GNU Public Licence.]
  .\"
! .Dd $Mdocdate: August 5 2019 $
  .Dt OPENSSL 1
  .Os
  .Sh NAME
--- 110,116 ----
  .\" copied and put under another distribution licence
  .\" [including the GNU Public Licence.]
  .\"
! .Dd $Mdocdate: October 4 2019 $
  .Dt OPENSSL 1
  .Os
  .Sh NAME
***************
*** 201,208 ****
  .Cm no- Ns Ar command
  itself.
  .Sh ASN1PARSE
! .nr nS 1
! .Nm "openssl asn1parse"
  .Op Fl i
  .Op Fl dlimit Ar number
  .Op Fl dump
--- 201,209 ----
  .Cm no- Ns Ar command
  itself.
  .Sh ASN1PARSE
! .Bl -hang -width "openssl asn1parse"
! .It Nm openssl asn1parse
! .Bk -words
  .Op Fl i
  .Op Fl dlimit Ar number
  .Op Fl dump
***************
*** 216,222 ****
  .Op Fl oid Ar file
  .Op Fl out Ar file
  .Op Fl strparse Ar offset
! .nr nS 0
  .Pp
  The
  .Nm asn1parse
--- 217,224 ----
  .Op Fl oid Ar file
  .Op Fl out Ar file
  .Op Fl strparse Ar offset
! .Ek
! .El
  .Pp
  The
  .Nm asn1parse
***************
*** 295,302 ****
  into a nested structure.
  .El
  .Sh CA
! .nr nS 1
! .Nm "openssl ca"
  .Op Fl batch
  .Op Fl cert Ar file
  .Op Fl config Ar file
--- 297,305 ----
  into a nested structure.
  .El
  .Sh CA
! .Bl -hang -width "openssl ca"
! .It Nm openssl ca
! .Bk -words
  .Op Fl batch
  .Op Fl cert Ar file
  .Op Fl config Ar file
***************
*** 341,347 ****
  .Op Fl updatedb
  .Op Fl utf8
  .Op Fl verbose
! .nr nS 0
  .Pp
  The
  .Nm ca
--- 344,351 ----
  .Op Fl updatedb
  .Op Fl utf8
  .Op Fl verbose
! .Ek
! .El
  .Pp
  The
  .Nm ca
***************
*** 874,881 ****
  but without cipher suite codes.
  .El
  .Sh CRL
! .nr nS 1
! .Nm "openssl crl"
  .Op Fl CAfile Ar file
  .Op Fl CApath Ar dir
  .Op Fl crlnumber
--- 878,886 ----
  but without cipher suite codes.
  .El
  .Sh CRL
! .Bl -hang -width "openssl crl"
! .It Nm openssl crl
! .Bk -words
  .Op Fl CAfile Ar file
  .Op Fl CApath Ar dir
  .Op Fl crlnumber
***************
*** 893,899 ****
  .Op Fl outform Cm der | pem
  .Op Fl text
  .Op Fl verify
! .nr nS 0
  .Pp
  The
  .Nm crl
--- 898,905 ----
  .Op Fl outform Cm der | pem
  .Op Fl text
  .Op Fl verify
! .Ek
! .El
  .Pp
  The
  .Nm crl
***************
*** 948,962 ****
  Verify the signature on the CRL.
  .El
  .Sh CRL2PKCS7
! .nr nS 1
! .Nm "openssl crl2pkcs7"
  .Op Fl certfile Ar file
  .Op Fl in Ar file
  .Op Fl inform Cm der | pem
  .Op Fl nocrl
  .Op Fl out Ar file
  .Op Fl outform Cm der | pem
! .nr nS 0
  .Pp
  The
  .Nm crl2pkcs7
--- 954,970 ----
  Verify the signature on the CRL.
  .El
  .Sh CRL2PKCS7
! .Bl -hang -width "openssl crl2pkcs7"
! .It Nm openssl crl2pkcs7
! .Bk -words
  .Op Fl certfile Ar file
  .Op Fl in Ar file
  .Op Fl inform Cm der | pem
  .Op Fl nocrl
  .Op Fl out Ar file
  .Op Fl outform Cm der | pem
! .Ek
! .El
  .Pp
  The
  .Nm crl2pkcs7
***************
*** 991,998 ****
  The output format.
  .El
  .Sh DGST
! .nr nS 1
! .Nm "openssl dgst"
  .Op Fl cdr
  .Op Fl binary
  .Op Fl Ar digest
--- 999,1007 ----
  The output format.
  .El
  .Sh DGST
! .Bl -hang -width "openssl dgst"
! .It Nm openssl dgst
! .Bk -words
  .Op Fl cdr
  .Op Fl binary
  .Op Fl Ar digest
***************
*** 1009,1015 ****
  .Op Fl sigopt Ar nm : Ns Ar v
  .Op Fl verify Ar file
  .Op Ar
! .nr nS 0
  .Pp
  The digest functions output the message digest of a supplied
  .Ar file
--- 1018,1025 ----
  .Op Fl sigopt Ar nm : Ns Ar v
  .Op Fl verify Ar file
  .Op Ar
! .Ek
! .El
  .Pp
  The digest functions output the message digest of a supplied
  .Ar file
***************
*** 1103,1110 ****
  If no files are specified then standard input is used.
  .El
  .Sh DHPARAM
! .nr nS 1
! .Nm "openssl dhparam"
  .Op Fl 2 | 5
  .Op Fl C
  .Op Fl check
--- 1113,1121 ----
  If no files are specified then standard input is used.
  .El
  .Sh DHPARAM
! .Bl -hang -width "openssl dhparam"
! .It Nm openssl dhparam
! .Bk -words
  .Op Fl 2 | 5
  .Op Fl C
  .Op Fl check
***************
*** 1116,1122 ****
  .Op Fl outform Cm der | pem
  .Op Fl text
  .Op Ar numbits
! .nr nS 0
  .Pp
  The
  .Nm dhparam
--- 1127,1134 ----
  .Op Fl outform Cm der | pem
  .Op Fl text
  .Op Ar numbits
! .Ek
! .El
  .Pp
  The
  .Nm dhparam
***************
*** 1177,1184 ****
  parameters are generated instead.
  .El
  .Sh DSA
! .nr nS 1
! .Nm "openssl dsa"
  .Oo
  .Fl aes128 | aes192 | aes256 |
  .Fl des | des3
--- 1189,1197 ----
  parameters are generated instead.
  .El
  .Sh DSA
! .Bl -hang -width "openssl dsa"
! .It Nm openssl dsa
! .Bk -words
  .Oo
  .Fl aes128 | aes192 | aes256 |
  .Fl des | des3
***************
*** 1195,1201 ****
  .Op Fl pubout
  .Op Fl pvk-none | pvk-strong | pvk-weak
  .Op Fl text
! .nr nS 0
  .Pp
  The
  .Nm dsa
--- 1208,1215 ----
  .Op Fl pubout
  .Op Fl pvk-none | pvk-strong | pvk-weak
  .Op Fl text
! .Ek
! .El
  .Pp
  The
  .Nm dsa
***************
*** 1263,1270 ****
  Print the public/private key in plain text.
  .El
  .Sh DSAPARAM
! .nr nS 1
! .Nm "openssl dsaparam"
  .Op Fl C
  .Op Fl genkey
  .Op Fl in Ar file
--- 1277,1285 ----
  Print the public/private key in plain text.
  .El
  .Sh DSAPARAM
! .Bl -hang -width "openssl dsaparam"
! .It Nm openssl dsaparam
! .Bk -words
  .Op Fl C
  .Op Fl genkey
  .Op Fl in Ar file
***************
*** 1274,1280 ****
  .Op Fl outform Cm der | pem
  .Op Fl text
  .Op Ar numbits
! .nr nS 0
  .Pp
  The
  .Nm dsaparam
--- 1289,1296 ----
  .Op Fl outform Cm der | pem
  .Op Fl text
  .Op Ar numbits
! .Ek
! .El
  .Pp
  The
  .Nm dsaparam
***************
*** 1313,1320 ****
  If this option is included, the input file is ignored.
  .El
  .Sh EC
! .nr nS 1
! .Nm "openssl ec"
  .Op Fl conv_form Ar arg
  .Op Fl des
  .Op Fl des3
--- 1329,1337 ----
  If this option is included, the input file is ignored.
  .El
  .Sh EC
! .Bl -hang -width "openssl ec"
! .It Nm openssl ec
! .Bk -words
  .Op Fl conv_form Ar arg
  .Op Fl des
  .Op Fl des3
***************
*** 1330,1336 ****
  .Op Fl pubin
  .Op Fl pubout
  .Op Fl text
! .nr nS 0
  .Pp
  The
  .Nm ec
--- 1347,1354 ----
  .Op Fl pubin
  .Op Fl pubout
  .Op Fl text
! .Ek
! .El
  .Pp
  The
  .Nm ec
***************
*** 1423,1430 ****
  Print the public/private key in plain text.
  .El
  .Sh ECPARAM
! .nr nS 1
! .Nm "openssl ecparam"
  .Op Fl C
  .Op Fl check
  .Op Fl conv_form Ar arg
--- 1441,1449 ----
  Print the public/private key in plain text.
  .El
  .Sh ECPARAM
! .Bl -hang -width "openssl ecparam"
! .It Nm openssl ecparam
! .Bk -words
  .Op Fl C
  .Op Fl check
  .Op Fl conv_form Ar arg
***************
*** 1439,1445 ****
  .Op Fl outform Cm der | pem
  .Op Fl param_enc Ar arg
  .Op Fl text
! .nr nS 0
  .Pp
  The
  .Nm ecparam
--- 1458,1465 ----
  .Op Fl outform Cm der | pem
  .Op Fl param_enc Ar arg
  .Op Fl text
! .Ek
! .El
  .Pp
  The
  .Nm ecparam
***************
*** 1516,1523 ****
  Print the EC parameters in plain text.
  .El
  .Sh ENC
! .nr nS 1
! .Nm "openssl enc"
  .Fl ciphername
  .Op Fl AadePpv
  .Op Fl base64
--- 1536,1544 ----
  Print the EC parameters in plain text.
  .El
  .Sh ENC
! .Bl -hang -width "openssl enc"
! .It Nm openssl enc
! .Bk -words
  .Fl ciphername
  .Op Fl AadePpv
  .Op Fl base64
***************
*** 1538,1544 ****
  .Op Fl pbkdf2
  .Op Fl S Ar salt
  .Op Fl salt
! .nr nS 0
  .Pp
  The symmetric cipher commands allow data to be encrypted or decrypted
  using various block and stream ciphers using keys based on passwords
--- 1559,1566 ----
  .Op Fl pbkdf2
  .Op Fl S Ar salt
  .Op Fl salt
! .Ek
! .El
  .Pp
  The symmetric cipher commands allow data to be encrypted or decrypted
  using various block and stream ciphers using keys based on passwords
***************
*** 1710,1717 ****
  Print debugging statistics about various aspects of the hash table.
  .El
  .Sh GENDSA
! .nr nS 1
! .Nm "openssl gendsa"
  .Oo
  .Fl aes128 | aes192 | aes256 | camellia128 |
  .Fl camellia192 | camellia256 | des | des3 | idea
--- 1732,1740 ----
  Print debugging statistics about various aspects of the hash table.
  .El
  .Sh GENDSA
! .Bl -hang -width "openssl gendsa"
! .It Nm openssl gendsa
! .Bk -words
  .Oo
  .Fl aes128 | aes192 | aes256 | camellia128 |
  .Fl camellia192 | camellia256 | des | des3 | idea
***************
*** 1719,1725 ****
  .Op Fl out Ar file
  .Op Fl passout Ar arg
  .Ar paramfile
! .nr nS 0
  .Pp
  The
  .Nm gendsa
--- 1742,1749 ----
  .Op Fl out Ar file
  .Op Fl passout Ar arg
  .Ar paramfile
! .Ek
! .El
  .Pp
  The
  .Nm gendsa
***************
*** 1754,1761 ****
  The parameters in this file determine the size of the private key.
  .El
  .Sh GENPKEY
! .nr nS 1
! .Nm "openssl genpkey"
  .Op Fl algorithm Ar alg
  .Op Ar cipher
  .Op Fl genparam
--- 1778,1786 ----
  The parameters in this file determine the size of the private key.
  .El
  .Sh GENPKEY
! .Bl -hang -width "openssl genpkey"
! .It Nm openssl genpkey
! .Bk -words
  .Op Fl algorithm Ar alg
  .Op Ar cipher
  .Op Fl genparam
***************
*** 1765,1771 ****
  .Op Fl pass Ar arg
  .Op Fl pkeyopt Ar opt : Ns Ar value
  .Op Fl text
! .nr nS 0
  .Pp
  The
  .Nm genpkey
--- 1790,1797 ----
  .Op Fl pass Ar arg
  .Op Fl pkeyopt Ar opt : Ns Ar value
  .Op Fl text
! .Ek
! .El
  .Pp
  The
  .Nm genpkey
***************
*** 1856,1863 ****
  Print the private/public key in plain text.
  .El
  .Sh GENRSA
! .nr nS 1
! .Nm "openssl genrsa"
  .Op Fl 3 | f4
  .Oo
  .Fl aes128 | aes192 | aes256 | camellia128 |
--- 1882,1890 ----
  Print the private/public key in plain text.
  .El
  .Sh GENRSA
! .Bl -hang -width "openssl genrsa"
! .It Nm openssl genrsa
! .Bk -words
  .Op Fl 3 | f4
  .Oo
  .Fl aes128 | aes192 | aes256 | camellia128 |
***************
*** 1866,1872 ****
  .Op Fl out Ar file
  .Op Fl passout Ar arg
  .Op Ar numbits
! .nr nS 0
  .Pp
  The
  .Nm genrsa
--- 1893,1900 ----
  .Op Fl out Ar file
  .Op Fl passout Ar arg
  .Op Ar numbits
! .Ek
! .El
  .Pp
  The
  .Nm genrsa
***************
*** 1941,1948 ****
  a Netscape certificate sequence is created from a file of certificates.
  .El
  .Sh OCSP
! .nr nS 1
! .Nm "openssl ocsp"
  .Op Fl CA Ar file
  .Op Fl CAfile Ar file
  .Op Fl CApath Ar directory
--- 1969,1977 ----
  a Netscape certificate sequence is created from a file of certificates.
  .El
  .Sh OCSP
! .Bl -hang -width "openssl ocsp"
! .It Nm openssl ocsp
! .Bk -words
  .Op Fl CA Ar file
  .Op Fl CAfile Ar file
  .Op Fl CApath Ar directory
***************
*** 1992,1998 ****
  .Op Fl VAfile Ar file
  .Op Fl validity_period Ar nsec
  .Op Fl verify_other Ar file
! .nr nS 0
  .Pp
  The Online Certificate Status Protocol (OCSP)
  enables applications to determine the (revocation) state
--- 2021,2028 ----
  .Op Fl VAfile Ar file
  .Op Fl validity_period Ar nsec
  .Op Fl verify_other Ar file
! .Ek
! .El
  .Pp
  The Online Certificate Status Protocol (OCSP)
  enables applications to determine the (revocation) state
***************
*** 2291,2298 ****
  .Fl VAfile
  option.
  .Sh PASSWD
! .nr nS 1
! .Nm "openssl passwd"
  .Op Fl 1 | apr1 | crypt
  .Op Fl in Ar file
  .Op Fl noverify
--- 2321,2329 ----
  .Fl VAfile
  option.
  .Sh PASSWD
! .Bl -hang -width "openssl passwd"
! .It Nm openssl passwd
! .Bk -words
  .Op Fl 1 | apr1 | crypt
  .Op Fl in Ar file
  .Op Fl noverify
***************
*** 2302,2308 ****
  .Op Fl stdin
  .Op Fl table
  .Op Ar password
! .nr nS 0
  .Pp
  The
  .Nm passwd
--- 2333,2340 ----
  .Op Fl stdin
  .Op Fl table
  .Op Ar password
! .Ek
! .El
  .Pp
  The
  .Nm passwd
***************
*** 2352,2359 ****
  to each password hash.
  .El
  .Sh PKCS7
! .nr nS 1
! .Nm "openssl pkcs7"
  .Op Fl in Ar file
  .Op Fl inform Cm der | pem
  .Op Fl noout
--- 2384,2392 ----
  to each password hash.
  .El
  .Sh PKCS7
! .Bl -hang -width "openssl pkcs7"
! .It Nm openssl pkcs7
! .Bk -words
  .Op Fl in Ar file
  .Op Fl inform Cm der | pem
  .Op Fl noout
***************
*** 2362,2368 ****
  .Op Fl print
  .Op Fl print_certs
  .Op Fl text
! .nr nS 0
  .Pp
  The
  .Nm pkcs7
--- 2395,2402 ----
  .Op Fl print
  .Op Fl print_certs
  .Op Fl text
! .Ek
! .El
  .Pp
  The
  .Nm pkcs7
***************
*** 2395,2402 ****
  Print certificate details in full rather than just subject and issuer names.
  .El
  .Sh PKCS8
! .nr nS 1
! .Nm "openssl pkcs8"
  .Op Fl in Ar file
  .Op Fl inform Cm der | pem
  .Op Fl nocrypt
--- 2429,2437 ----
  Print certificate details in full rather than just subject and issuer names.
  .El
  .Sh PKCS8
! .Bl -hang -width "openssl pkcs8"
! .It Nm openssl pkcs8
! .Bk -words
  .Op Fl in Ar file
  .Op Fl inform Cm der | pem
  .Op Fl nocrypt
***************
*** 2408,2414 ****
  .Op Fl topk8
  .Op Fl v1 Ar alg
  .Op Fl v2 Ar alg
! .nr nS 0
  .Pp
  The
  .Nm pkcs8
--- 2443,2450 ----
  .Op Fl topk8
  .Op Fl v1 Ar alg
  .Op Fl v2 Ar alg
! .Ek
! .El
  .Pp
  The
  .Nm pkcs8
***************
*** 2476,2483 ****
  It is recommended that des3 is used.
  .El
  .Sh PKCS12
! .nr nS 1
! .Nm "openssl pkcs12"
  .Oo
  .Fl aes128 | aes192 | aes256 | camellia128 |
  .Fl camellia192 | camellia256 | des | des3 | idea
--- 2512,2520 ----
  It is recommended that des3 is used.
  .El
  .Sh PKCS12
! .Bl -hang -width "openssl pkcs12"
! .It Nm openssl pkcs12
! .Bk -words
  .Oo
  .Fl aes128 | aes192 | aes256 | camellia128 |
  .Fl camellia192 | camellia256 | des | des3 | idea
***************
*** 2516,2522 ****
  .Op Fl passout Ar arg
  .Op Fl password Ar arg
  .Op Fl twopass
! .nr nS 0
  .Pp
  The
  .Nm pkcs12
--- 2553,2560 ----
  .Op Fl passout Ar arg
  .Op Fl password Ar arg
  .Op Fl twopass
! .Ek
! .El
  .Pp
  The
  .Nm pkcs12
***************
*** 2691,2698 ****
  .Fl passin .
  .El
  .Sh PKEY
! .nr nS 1
! .Nm "openssl pkey"
  .Op Ar cipher
  .Op Fl in Ar file
  .Op Fl inform Cm der | pem
--- 2729,2737 ----
  .Fl passin .
  .El
  .Sh PKEY
! .Bl -hang -width "openssl pkey"
! .It Nm openssl pkey
! .Bk -words
  .Op Ar cipher
  .Op Fl in Ar file
  .Op Fl inform Cm der | pem
***************
*** 2705,2711 ****
  .Op Fl pubout
  .Op Fl text
  .Op Fl text_pub
! .nr nS 0
  .Pp
  The
  .Nm pkey
--- 2744,2751 ----
  .Op Fl pubout
  .Op Fl text
  .Op Fl text_pub
! .Ek
! .El
  .Pp
  The
  .Nm pkey
***************
*** 2777,2784 ****
  Print the parameters in plain text.
  .El
  .Sh PKEYUTL
! .nr nS 1
! .Nm "openssl pkeyutl"
  .Op Fl asn1parse
  .Op Fl certin
  .Op Fl decrypt
--- 2817,2825 ----
  Print the parameters in plain text.
  .El
  .Sh PKEYUTL
! .Bl -hang -width "openssl pkeyutl"
! .It Nm openssl pkeyutl
! .Bk -words
  .Op Fl asn1parse
  .Op Fl certin
  .Op Fl decrypt
***************
*** 2799,2805 ****
  .Op Fl sign
  .Op Fl verify
  .Op Fl verifyrecover
! .nr nS 0
  .Pp
  The
  .Nm pkeyutl
--- 2840,2847 ----
  .Op Fl sign
  .Op Fl verify
  .Op Fl verifyrecover
! .Ek
! .El
  .Pp
  The
  .Nm pkeyutl
***************
*** 2971,2983 ****
  is prime.
  .El
  .Sh RAND
! .nr nS 1
! .Nm "openssl rand"
  .Op Fl base64
  .Op Fl hex
  .Op Fl out Ar file
  .Ar num
! .nr nS 0
  .Pp
  The
  .Nm rand
--- 3013,3027 ----
  is prime.
  .El
  .Sh RAND
! .Bl -hang -width "openssl rand"
! .It Nm openssl rand
! .Bk -words
  .Op Fl base64
  .Op Fl hex
  .Op Fl out Ar file
  .Ar num
! .Ek
! .El
  .Pp
  The
  .Nm rand
***************
*** 2996,3003 ****
  or standard output if not specified.
  .El
  .Sh REQ
! .nr nS 1
! .Nm "openssl req"
  .Op Fl asn1-kludge
  .Op Fl batch
  .Op Fl config Ar file
--- 3040,3048 ----
  or standard output if not specified.
  .El
  .Sh REQ
! .Bl -hang -width "openssl req"
! .It Nm openssl req
! .Bk -words
  .Op Fl asn1-kludge
  .Op Fl batch
  .Op Fl config Ar file
***************
*** 3035,3041 ****
  .Op Fl verbose
  .Op Fl verify
  .Op Fl x509
! .nr nS 0
  .Pp
  The
  .Nm req
--- 3080,3087 ----
  .Op Fl verbose
  .Op Fl verify
  .Op Fl x509
! .Ek
! .El
  .Pp
  The
  .Nm req
***************
*** 3435,3442 ****
  Any additional fields will be treated as though they were a
  .Cm DirectoryString .
  .Sh RSA
! .nr nS 1
! .Nm "openssl rsa"
  .Op Fl aes128 | aes192 | aes256 | des | des3
  .Op Fl check
  .Op Fl in Ar file
--- 3481,3489 ----
  Any additional fields will be treated as though they were a
  .Cm DirectoryString .
  .Sh RSA
! .Bl -hang -width "openssl rsa"
! .It Nm openssl rsa
! .Bk -words
  .Op Fl aes128 | aes192 | aes256 | des | des3
  .Op Fl check
  .Op Fl in Ar file
***************
*** 3454,3460 ****
  .Op Fl RSAPublicKey_out
  .Op Fl sgckey
  .Op Fl text
! .nr nS 0
  .Pp
  The
  .Nm rsa
--- 3501,3508 ----
  .Op Fl RSAPublicKey_out
  .Op Fl sgckey
  .Op Fl text
! .Ek
! .El
  .Pp
  The
  .Nm rsa
***************
*** 3530,3537 ****
  Print the public/private key components in plain text.
  .El
  .Sh RSAUTL
! .nr nS 1
! .Nm "openssl rsautl"
  .Op Fl asn1parse
  .Op Fl certin
  .Op Fl decrypt
--- 3578,3586 ----
  Print the public/private key components in plain text.
  .El
  .Sh RSAUTL
! .Bl -hang -width "openssl rsautl"
! .It Nm openssl rsautl
! .Bk -words
  .Op Fl asn1parse
  .Op Fl certin
  .Op Fl decrypt
***************
*** 3547,3553 ****
  .Op Fl rev
  .Op Fl sign
  .Op Fl verify
! .nr nS 0
  .Pp
  The
  .Nm rsautl
--- 3596,3603 ----
  .Op Fl rev
  .Op Fl sign
  .Op Fl verify
! .Ek
! .El
  .Pp
  The
  .Nm rsautl
***************
*** 3602,3609 ****
  Verify the input data and output the recovered data.
  .El
  .Sh S_CLIENT
! .nr nS 1
! .Nm "openssl s_client"
  .Op Fl 4 | 6
  .Op Fl alpn Ar protocols
  .Op Fl bugs
--- 3652,3660 ----
  Verify the input data and output the recovered data.
  .El
  .Sh S_CLIENT
! .Bl -hang -width "openssl s_client"
! .It Nm openssl s_client
! .Bk -words
  .Op Fl 4 | 6
  .Op Fl alpn Ar protocols
  .Op Fl bugs
***************
*** 3667,3673 ****
  .Op Fl verify_return_error
  .Op Fl x509_strict
  .Op Fl xmpphost Ar host
! .nr nS 0
  .Pp
  The
  .Nm s_client
--- 3718,3725 ----
  .Op Fl verify_return_error
  .Op Fl x509_strict
  .Op Fl xmpphost Ar host
! .Ek
! .El
  .Pp
  The
  .Nm s_client
***************
*** 3896,3903 ****
  will be used.
  .El
  .Sh S_SERVER
! .nr nS 1
! .Nm "openssl s_server"
  .Op Fl accept Ar port
  .Op Fl alpn Ar protocols
  .Op Fl bugs
--- 3948,3956 ----
  will be used.
  .El
  .Sh S_SERVER
! .Bl -hang -width "openssl s_server"
! .It Nm openssl s_server
! .Bk -words
  .Op Fl accept Ar port
  .Op Fl alpn Ar protocols
  .Op Fl bugs
***************
*** 3961,3967 ****
  .Op Fl verify_return_error
  .Op Fl WWW
  .Op Fl www
! .nr nS 0
  .Pp
  The
  .Nm s_server
--- 4014,4021 ----
  .Op Fl verify_return_error
  .Op Fl WWW
  .Op Fl www
! .Ek
! .El
  .Pp
  The
  .Nm s_server
***************
*** 4199,4206 ****
  a certificate is requested but the client does not have to send one.
  .El
  .Sh S_TIME
! .nr nS 1
! .Nm "openssl s_time"
  .Op Fl bugs
  .Op Fl CAfile Ar file
  .Op Fl CApath Ar directory
--- 4253,4261 ----
  a certificate is requested but the client does not have to send one.
  .El
  .Sh S_TIME
! .Bl -hang -width "openssl s_time"
! .It Nm openssl s_time
! .Bk -words
  .Op Fl bugs
  .Op Fl CAfile Ar file
  .Op Fl CApath Ar directory
***************
*** 4215,4221 ****
  .Op Fl time Ar seconds
  .Op Fl verify Ar depth
  .Op Fl www Ar page
! .nr nS 0
  .Pp
  The
  .Nm s_time
--- 4270,4277 ----
  .Op Fl time Ar seconds
  .Op Fl verify Ar depth
  .Op Fl www Ar page
! .Ek
! .El
  .Pp
  The
  .Nm s_time
***************
*** 4307,4314 ****
  but not transfer any payload data.
  .El
  .Sh SESS_ID
! .nr nS 1
! .Nm "openssl sess_id"
  .Op Fl cert
  .Op Fl context Ar ID
  .Op Fl in Ar file
--- 4363,4371 ----
  but not transfer any payload data.
  .El
  .Sh SESS_ID
! .Bl -hang -width "openssl sess_id"
! .It Nm openssl sess_id
! .Bk -words
  .Op Fl cert
  .Op Fl context Ar ID
  .Op Fl in Ar file
***************
*** 4317,4323 ****
  .Op Fl out Ar file
  .Op Fl outform Cm der | pem
  .Op Fl text
! .nr nS 0
  .Pp
  The
  .Nm sess_id
--- 4374,4381 ----
  .Op Fl out Ar file
  .Op Fl outform Cm der | pem
  .Op Fl text
! .Ek
! .El
  .Pp
  The
  .Nm sess_id
***************
*** 4397,4404 ****
  This is, however, strongly discouraged and should only be used for
  debugging purposes.
  .Sh SMIME
! .nr nS 1
! .Nm "openssl smime"
  .Oo
  .Fl aes128 | aes192 | aes256 | des |
  .Fl des3 | rc2-40 | rc2-64 | rc2-128
--- 4455,4463 ----
  This is, however, strongly discouraged and should only be used for
  debugging purposes.
  .Sh SMIME
! .Bl -hang -width "openssl smime"
! .It Nm openssl smime
! .Bk -words
  .Oo
  .Fl aes128 | aes192 | aes256 | des |
  .Fl des3 | rc2-40 | rc2-64 | rc2-128
***************
*** 4448,4454 ****
  .Op Fl verify
  .Op Fl x509_strict
  .Op Ar cert.pem ...
! .nr nS 0
  .Pp
  The
  .Nm smime
--- 4507,4514 ----
  .Op Fl verify
  .Op Fl x509_strict
  .Op Ar cert.pem ...
! .Ek
! .El
  .Pp
  The
  .Nm smime
***************
*** 4691,4705 ****
  An error occurred writing certificates.
  .El
  .Sh SPEED
! .nr nS 1
! .Nm "openssl speed"
  .Op Ar algorithm
  .Op Fl decrypt
  .Op Fl elapsed
  .Op Fl evp Ar algorithm
  .Op Fl mr
  .Op Fl multi Ar number
! .nr nS 0
  .Pp
  The
  .Nm speed
--- 4751,4767 ----
  An error occurred writing certificates.
  .El
  .Sh SPEED
! .Bl -hang -width "openssl speed"
! .It Nm openssl speed
! .Bk -words
  .Op Ar algorithm
  .Op Fl decrypt
  .Op Fl elapsed
  .Op Fl evp Ar algorithm
  .Op Fl mr
  .Op Fl multi Ar number
! .Ek
! .El
  .Pp
  The
  .Nm speed
***************
*** 4726,4733 ****
  benchmarks in parallel.
  .El
  .Sh SPKAC
! .nr nS 1
! .Nm "openssl spkac"
  .Op Fl challenge Ar string
  .Op Fl in Ar file
  .Op Fl key Ar keyfile
--- 4788,4796 ----
  benchmarks in parallel.
  .El
  .Sh SPKAC
! .Bl -hang -width "openssl spkac"
! .It Nm openssl spkac
! .Bk -words
  .Op Fl challenge Ar string
  .Op Fl in Ar file
  .Op Fl key Ar keyfile
***************
*** 4738,4744 ****
  .Op Fl spkac Ar spkacname
  .Op Fl spksect Ar section
  .Op Fl verify
! .nr nS 0
  .Pp
  The
  .Nm spkac
--- 4801,4808 ----
  .Op Fl spkac Ar spkacname
  .Op Fl spksect Ar section
  .Op Fl verify
! .Ek
! .El
  .Pp
  The
  .Nm spkac
***************
*** 4785,4792 ****
  Verify the digital signature on the supplied SPKAC.
  .El
  .Sh TS
! .nr nS 1
! .Nm "openssl ts"
  .Fl query
  .Op Fl md4 | md5 | ripemd160 | sha1
  .Op Fl cert
--- 4849,4857 ----
  Verify the digital signature on the supplied SPKAC.
  .El
  .Sh TS
! .Bk -words
! .Bl -hang -width "openssl ts"
! .It Nm openssl ts
  .Fl query
  .Op Fl md4 | md5 | ripemd160 | sha1
  .Op Fl cert
***************
*** 4798,4807 ****
  .Op Fl out Ar request.tsq
  .Op Fl policy Ar object_id
  .Op Fl text
! .nr nS 0
! .Pp
! .nr nS 1
! .Nm "openssl ts"
  .Fl reply
  .Op Fl chain Ar certs_file.pem
  .Op Fl config Ar configfile
--- 4863,4869 ----
  .Op Fl out Ar request.tsq
  .Op Fl policy Ar object_id
  .Op Fl text
! .It Nm openssl ts
  .Fl reply
  .Op Fl chain Ar certs_file.pem
  .Op Fl config Ar configfile
***************
*** 4816,4825 ****
  .Op Fl text
  .Op Fl token_in
  .Op Fl token_out
! .nr nS 0
! .Pp
! .nr nS 1
! .Nm "openssl ts"
  .Fl verify
  .Op Fl CAfile Ar trusted_certs.pem
  .Op Fl CApath Ar trusted_cert_path
--- 4878,4884 ----
  .Op Fl text
  .Op Fl token_in
  .Op Fl token_out
! .It Nm openssl ts
  .Fl verify
  .Op Fl CAfile Ar trusted_certs.pem
  .Op Fl CApath Ar trusted_cert_path
***************
*** 4829,4835 ****
  .Op Fl queryfile Ar request.tsq
  .Op Fl token_in
  .Op Fl untrusted Ar cert_file.pem
! .nr nS 0
  .Pp
  The
  .Nm ts
--- 4888,4895 ----
  .Op Fl queryfile Ar request.tsq
  .Op Fl token_in
  .Op Fl untrusted Ar cert_file.pem
! .El
! .Ek
  .Pp
  The
  .Nm ts
***************
*** 5151,5158 ****
  The default is no.
  .El
  .Sh VERIFY
! .nr nS 1
! .Nm "openssl verify"
  .Op Fl CAfile Ar file
  .Op Fl CApath Ar directory
  .Op Fl check_ss_sig
--- 5211,5219 ----
  The default is no.
  .El
  .Sh VERIFY
! .Bl -hang -width "openssl verify"
! .It Nm openssl verify
! .Bk -words
  .Op Fl CAfile Ar file
  .Op Fl CApath Ar directory
  .Op Fl check_ss_sig
***************
*** 5173,5179 ****
  .Op Fl verbose
  .Op Fl x509_strict
  .Op Ar certificates
! .nr nS 0
  .Pp
  The
  .Nm verify
--- 5234,5241 ----
  .Op Fl verbose
  .Op Fl x509_strict
  .Op Ar certificates
! .Ek
! .El
  .Pp
  The
  .Nm verify
***************
*** 5507,5514 ****
  version.
  .El
  .Sh X509
! .nr nS 1
! .Nm "openssl x509"
  .Op Fl C
  .Op Fl addreject Ar arg
  .Op Fl addtrust Ar arg
--- 5569,5577 ----
  version.
  .El
  .Sh X509
! .Bl -hang -width "openssl x509"
! .It Nm openssl x509
! .Bk -words
  .Op Fl C
  .Op Fl addreject Ar arg
  .Op Fl addtrust Ar arg
***************
*** 5563,5569 ****
  .Op Fl text
  .Op Fl trustout
  .Op Fl x509toreq
! .nr nS 0
  .Pp
  The
  .Nm x509
--- 5626,5633 ----
  .Op Fl text
  .Op Fl trustout
  .Op Fl x509toreq
! .Ek
! .El
  .Pp
  The
  .Nm x509