diff options
author | naddy <> | 2022-03-31 17:27:26 +0000 |
---|---|---|
committer | naddy <> | 2022-03-31 17:27:26 +0000 |
commit | 086b95c9573f2c3a1b0b5652129686eb64beeb7e (patch) | |
tree | dd215ed7ee26566711b4b3f92093356c3f542d9e /src/usr.bin | |
parent | 609f16ba617e874a45ceef4f2e8463f010e5dbe7 (diff) | |
download | openbsd-086b95c9573f2c3a1b0b5652129686eb64beeb7e.tar.gz openbsd-086b95c9573f2c3a1b0b5652129686eb64beeb7e.tar.bz2 openbsd-086b95c9573f2c3a1b0b5652129686eb64beeb7e.zip |
man pages: add missing commas between subordinate and main clauses
jmc@ dislikes a comma before "then" in a conditional, so leave those
untouched.
ok jmc@
Diffstat (limited to 'src/usr.bin')
-rw-r--r-- | src/usr.bin/openssl/openssl.1 | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1 index 92c4af720c..6b701609c2 100644 --- a/src/usr.bin/openssl/openssl.1 +++ b/src/usr.bin/openssl/openssl.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: openssl.1,v 1.136 2022/02/18 10:24:32 jsg Exp $ | 1 | .\" $OpenBSD: openssl.1,v 1.137 2022/03/31 17:27:26 naddy Exp $ |
2 | .\" ==================================================================== | 2 | .\" ==================================================================== |
3 | .\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. | 3 | .\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -110,7 +110,7 @@ | |||
110 | .\" copied and put under another distribution licence | 110 | .\" copied and put under another distribution licence |
111 | .\" [including the GNU Public Licence.] | 111 | .\" [including the GNU Public Licence.] |
112 | .\" | 112 | .\" |
113 | .Dd $Mdocdate: February 18 2022 $ | 113 | .Dd $Mdocdate: March 31 2022 $ |
114 | .Dt OPENSSL 1 | 114 | .Dt OPENSSL 1 |
115 | .Os | 115 | .Os |
116 | .Sh NAME | 116 | .Sh NAME |
@@ -272,7 +272,7 @@ If an OID | |||
272 | .Pq object identifier | 272 | .Pq object identifier |
273 | is not part of | 273 | is not part of |
274 | .Nm openssl Ns 's | 274 | .Nm openssl Ns 's |
275 | internal table it will be represented in | 275 | internal table, it will be represented in |
276 | numerical form | 276 | numerical form |
277 | .Pq for example 1.2.3.4 . | 277 | .Pq for example 1.2.3.4 . |
278 | .Pp | 278 | .Pp |
@@ -1146,8 +1146,8 @@ should be linked to each certificate. | |||
1146 | One or more certificates of message recipients: used when encrypting a message. | 1146 | One or more certificates of message recipients: used when encrypting a message. |
1147 | .It Fl certfile Ar file | 1147 | .It Fl certfile Ar file |
1148 | Allows additional certificates to be specified. | 1148 | Allows additional certificates to be specified. |
1149 | When signing these will be included with the message. | 1149 | When signing, these will be included with the message. |
1150 | When verifying these will be searched for the signer's certificates. | 1150 | When verifying, these will be searched for the signer's certificates. |
1151 | The certificates should be in PEM format. | 1151 | The certificates should be in PEM format. |
1152 | .It Fl certsout Ar file | 1152 | .It Fl certsout Ar file |
1153 | A file that any certificates contained in the message are written to. | 1153 | A file that any certificates contained in the message are written to. |
@@ -1198,7 +1198,7 @@ email address matches that specified in the From: address. | |||
1198 | .It Fl econtent_type Ar type | 1198 | .It Fl econtent_type Ar type |
1199 | Set the encapsulated content type, used with | 1199 | Set the encapsulated content type, used with |
1200 | .Fl sign . | 1200 | .Fl sign . |
1201 | If not supplied the Data type is used. | 1201 | If not supplied, the Data type is used. |
1202 | The type argument can be any valid OID name in either text or numerical format. | 1202 | The type argument can be any valid OID name in either text or numerical format. |
1203 | .It Fl in Ar file | 1203 | .It Fl in Ar file |
1204 | The input message to be encrypted or signed or the message to be decrypted or | 1204 | The input message to be encrypted or signed or the message to be decrypted or |
@@ -1227,7 +1227,7 @@ the certificate file specified with the | |||
1227 | or | 1227 | or |
1228 | .Fl signer | 1228 | .Fl signer |
1229 | file. | 1229 | file. |
1230 | When signing this option can be used multiple times to specify successive keys. | 1230 | When signing, this option can be used multiple times to specify successive keys. |
1231 | .It Fl keyform Cm der | pem | 1231 | .It Fl keyform Cm der | pem |
1232 | Input private key format. | 1232 | Input private key format. |
1233 | The default is | 1233 | The default is |
@@ -1270,7 +1270,7 @@ the | |||
1270 | .Fl certfile | 1270 | .Fl certfile |
1271 | option for example). | 1271 | option for example). |
1272 | .It Fl nodetach | 1272 | .It Fl nodetach |
1273 | When signing a message use opaque signing. | 1273 | When signing a message, use opaque signing. |
1274 | This form is more resistant to translation by mail relays but it cannot be | 1274 | This form is more resistant to translation by mail relays but it cannot be |
1275 | read by mail agents that do not support S/MIME. | 1275 | read by mail agents that do not support S/MIME. |
1276 | Without this option cleartext signing with the MIME type multipart/signed is | 1276 | Without this option cleartext signing with the MIME type multipart/signed is |
@@ -1279,7 +1279,7 @@ used. | |||
1279 | Only the certificates specified in the | 1279 | Only the certificates specified in the |
1280 | .Fl certfile | 1280 | .Fl certfile |
1281 | option are used. | 1281 | option are used. |
1282 | When verifying a message normally certificates (if any) included in the | 1282 | When verifying a message, normally certificates (if any) included in the |
1283 | message are searched for the signing certificate. | 1283 | message are searched for the signing certificate. |
1284 | The supplied certificates can still be used as untrusted CAs however. | 1284 | The supplied certificates can still be used as untrusted CAs however. |
1285 | .It Fl nooldmime | 1285 | .It Fl nooldmime |
@@ -1354,10 +1354,10 @@ operation. | |||
1354 | Add an explicit email address where signed receipts should be sent to. | 1354 | Add an explicit email address where signed receipts should be sent to. |
1355 | This option must be supplied if a signed receipt is requested. | 1355 | This option must be supplied if a signed receipt is requested. |
1356 | .It Fl recip Ar file | 1356 | .It Fl recip Ar file |
1357 | When decrypting a message this specifies the recipient's certificate. | 1357 | When decrypting a message, this specifies the recipient's certificate. |
1358 | The certificate must match one of the recipients of the message or an | 1358 | The certificate must match one of the recipients of the message or an |
1359 | error occurs. | 1359 | error occurs. |
1360 | When encrypting a message this option may be used multiple times to | 1360 | When encrypting a message, this option may be used multiple times to |
1361 | specify each recipient. | 1361 | specify each recipient. |
1362 | This form must be used if customised parameters are required (for example to | 1362 | This form must be used if customised parameters are required (for example to |
1363 | specify RSA-OAEP). | 1363 | specify RSA-OAEP). |
@@ -1377,7 +1377,7 @@ operations. | |||
1377 | When used with | 1377 | When used with |
1378 | .Fl encrypt | 1378 | .Fl encrypt |
1379 | or | 1379 | or |
1380 | .Fl decrypt | 1380 | .Fl decrypt , |
1381 | the supplied key is used to wrap or unwrap the content encryption key | 1381 | the supplied key is used to wrap or unwrap the content encryption key |
1382 | using an AES key in the KEKRecipientInfo type. | 1382 | using an AES key in the KEKRecipientInfo type. |
1383 | .It Fl secretkeyid Ar id | 1383 | .It Fl secretkeyid Ar id |
@@ -1418,7 +1418,7 @@ This option currently has no effect. | |||
1418 | .It Fl text | 1418 | .It Fl text |
1419 | Add plain text (text/plain) MIME headers to the supplied message if | 1419 | Add plain text (text/plain) MIME headers to the supplied message if |
1420 | encrypting or signing. | 1420 | encrypting or signing. |
1421 | If decrypting or verifying it strips off text headers: if the decrypted | 1421 | If decrypting or verifying, it strips off text headers: if the decrypted |
1422 | or verified message is not of MIME type text/plain then an error occurs. | 1422 | or verified message is not of MIME type text/plain then an error occurs. |
1423 | .It Fl verify_retcode | 1423 | .It Fl verify_retcode |
1424 | Set verification error code to exit code to indicate what verification error | 1424 | Set verification error code to exit code to indicate what verification error |
@@ -2280,7 +2280,7 @@ to use: | |||
2280 | this must be represented as a string comprised only of hex digits. | 2280 | this must be represented as a string comprised only of hex digits. |
2281 | .It Fl salt | 2281 | .It Fl salt |
2282 | Use a salt in the key derivation routines (the default). | 2282 | Use a salt in the key derivation routines (the default). |
2283 | When the salt is being used | 2283 | When the salt is being used, |
2284 | the first eight bytes of the encrypted data are reserved for the salt: | 2284 | the first eight bytes of the encrypted data are reserved for the salt: |
2285 | it is randomly generated when encrypting a file and read from the | 2285 | it is randomly generated when encrypting a file and read from the |
2286 | encrypted file when it is decrypted. | 2286 | encrypted file when it is decrypted. |
@@ -2423,7 +2423,7 @@ The output format. | |||
2423 | .It Fl paramfile Ar file | 2423 | .It Fl paramfile Ar file |
2424 | Some public key algorithms generate a private key based on a set of parameters, | 2424 | Some public key algorithms generate a private key based on a set of parameters, |
2425 | which can be supplied using this option. | 2425 | which can be supplied using this option. |
2426 | If this option is used the public key | 2426 | If this option is used, the public key |
2427 | algorithm used is determined by the parameters. | 2427 | algorithm used is determined by the parameters. |
2428 | This option must precede any | 2428 | This option must precede any |
2429 | .Fl pkeyopt | 2429 | .Fl pkeyopt |
@@ -2710,7 +2710,7 @@ If an OCSP request is being created (using the | |||
2710 | .Fl cert | 2710 | .Fl cert |
2711 | and | 2711 | and |
2712 | .Fl serial | 2712 | .Fl serial |
2713 | options) | 2713 | options), |
2714 | a nonce is automatically added; specifying | 2714 | a nonce is automatically added; specifying |
2715 | .Fl no_nonce | 2715 | .Fl no_nonce |
2716 | overrides this. | 2716 | overrides this. |
@@ -3306,7 +3306,7 @@ The MAC is used to check the file integrity but since it will normally | |||
3306 | have the same password as the keys and certificates it could also be attacked. | 3306 | have the same password as the keys and certificates it could also be attacked. |
3307 | By default, both MAC and encryption iteration counts are set to 2048; | 3307 | By default, both MAC and encryption iteration counts are set to 2048; |
3308 | using these options the MAC and encryption iteration counts can be set to 1. | 3308 | using these options the MAC and encryption iteration counts can be set to 1. |
3309 | Since this reduces the file security you should not use these options | 3309 | Since this reduces the file security, you should not use these options |
3310 | unless you really have to. | 3310 | unless you really have to. |
3311 | Most software supports both MAC and key iteration counts. | 3311 | Most software supports both MAC and key iteration counts. |
3312 | .It Fl out Ar file | 3312 | .It Fl out Ar file |
@@ -3802,7 +3802,7 @@ generates an RSA key | |||
3802 | in size. | 3802 | in size. |
3803 | If | 3803 | If |
3804 | .Ar nbits | 3804 | .Ar nbits |
3805 | is omitted | 3805 | is omitted, |
3806 | the default key size is used. | 3806 | the default key size is used. |
3807 | .Pp | 3807 | .Pp |
3808 | .No dsa : Ns Ar file | 3808 | .No dsa : Ns Ar file |
@@ -5327,7 +5327,7 @@ option, for example). | |||
5327 | Do not do chain verification of signers' certificates: that is, | 5327 | Do not do chain verification of signers' certificates: that is, |
5328 | don't use the certificates in the signed message as untrusted CAs. | 5328 | don't use the certificates in the signed message as untrusted CAs. |
5329 | .It Fl nodetach | 5329 | .It Fl nodetach |
5330 | When signing a message use opaque signing: this form is more resistant | 5330 | When signing a message, use opaque signing: this form is more resistant |
5331 | to translation by mail relays but it cannot be read by mail agents that | 5331 | to translation by mail relays but it cannot be read by mail agents that |
5332 | do not support S/MIME. | 5332 | do not support S/MIME. |
5333 | Without this option cleartext signing with the MIME type | 5333 | Without this option cleartext signing with the MIME type |
@@ -5664,7 +5664,7 @@ This option does not require a request; | |||
5664 | it is useful, for example, | 5664 | it is useful, for example, |
5665 | to examine the content of a response or token | 5665 | to examine the content of a response or token |
5666 | or to extract the time stamp token from a response. | 5666 | or to extract the time stamp token from a response. |
5667 | If the input is a token and the output is a time stamp response a default | 5667 | If the input is a token and the output is a time stamp response, a default |
5668 | .Qq granted | 5668 | .Qq granted |
5669 | status info is added to the token. | 5669 | status info is added to the token. |
5670 | .It Fl inkey Ar private.pem | 5670 | .It Fl inkey Ar private.pem |
@@ -5685,7 +5685,7 @@ The key password source. | |||
5685 | The default policy to use for the response. | 5685 | The default policy to use for the response. |
5686 | Either dotted OID notation or OID names defined | 5686 | Either dotted OID notation or OID names defined |
5687 | in the config file can be used. | 5687 | in the config file can be used. |
5688 | If no policy is requested the TSA uses its own default policy. | 5688 | If no policy is requested, the TSA uses its own default policy. |
5689 | .It Fl queryfile Ar request.tsq | 5689 | .It Fl queryfile Ar request.tsq |
5690 | The file containing a DER-encoded time stamp request. | 5690 | The file containing a DER-encoded time stamp request. |
5691 | .It Fl section Ar tsa_section | 5691 | .It Fl section Ar tsa_section |
@@ -5795,7 +5795,7 @@ for a description. | |||
5795 | The file containing the hexadecimal serial number of the | 5795 | The file containing the hexadecimal serial number of the |
5796 | last time stamp response created. | 5796 | last time stamp response created. |
5797 | This number is incremented by 1 for each response. | 5797 | This number is incremented by 1 for each response. |
5798 | If the file does not exist at the time of response generation | 5798 | If the file does not exist at the time of response generation, |
5799 | a new file is created with serial number 1. | 5799 | a new file is created with serial number 1. |
5800 | This parameter is mandatory. | 5800 | This parameter is mandatory. |
5801 | .It Cm signer_cert | 5801 | .It Cm signer_cert |