diff options
author | inoguchi <> | 2019-07-05 14:33:10 +0000 |
---|---|---|
committer | inoguchi <> | 2019-07-05 14:33:10 +0000 |
commit | dd36ac046094b5622688c840e5eac0eeac0c132b (patch) | |
tree | 823299fb3cc2ba4dc73d2b48faaa2248c6ddb3b8 | |
parent | a2b077666296f6864387d870092af9604932c376 (diff) | |
download | openbsd-dd36ac046094b5622688c840e5eac0eeac0c132b.tar.gz openbsd-dd36ac046094b5622688c840e5eac0eeac0c132b.tar.bz2 openbsd-dd36ac046094b5622688c840e5eac0eeac0c132b.zip |
Fix manual openssl(1) ec, enc and pkcs7
- For ec, add -param_out description
- For enc, add -v usage and description
- For pkcs7, add -print usage and description
ok jmc@
-rw-r--r-- | src/usr.bin/openssl/openssl.1 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1 index e7adfcea8f..15910b75df 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.105 2019/07/05 11:50:46 inoguchi Exp $ | 1 | .\" $OpenBSD: openssl.1,v 1.106 2019/07/05 14:33:10 inoguchi 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 | .\" |
@@ -1401,6 +1401,8 @@ Note: the | |||
1401 | alternative, | 1401 | alternative, |
1402 | as specified in RFC 3279, | 1402 | as specified in RFC 3279, |
1403 | is currently not implemented. | 1403 | is currently not implemented. |
1404 | .It Fl param_out | ||
1405 | Print the elliptic curve parameters. | ||
1404 | .It Fl passin Ar arg | 1406 | .It Fl passin Ar arg |
1405 | The key password source. | 1407 | The key password source. |
1406 | .It Fl passout Ar arg | 1408 | .It Fl passout Ar arg |
@@ -1510,7 +1512,7 @@ Print the EC parameters in plain text. | |||
1510 | .nr nS 1 | 1512 | .nr nS 1 |
1511 | .Nm "openssl enc" | 1513 | .Nm "openssl enc" |
1512 | .Fl ciphername | 1514 | .Fl ciphername |
1513 | .Op Fl AadePp | 1515 | .Op Fl AadePpv |
1514 | .Op Fl base64 | 1516 | .Op Fl base64 |
1515 | .Op Fl bufsize Ar number | 1517 | .Op Fl bufsize Ar number |
1516 | .Op Fl debug | 1518 | .Op Fl debug |
@@ -1667,6 +1669,8 @@ When the salt is being used | |||
1667 | the first eight bytes of the encrypted data are reserved for the salt: | 1669 | the first eight bytes of the encrypted data are reserved for the salt: |
1668 | it is randomly generated when encrypting a file and read from the | 1670 | it is randomly generated when encrypting a file and read from the |
1669 | encrypted file when it is decrypted. | 1671 | encrypted file when it is decrypted. |
1672 | .It Fl v | ||
1673 | Print extra details about the processing. | ||
1670 | .El | 1674 | .El |
1671 | .Sh ERRSTR | 1675 | .Sh ERRSTR |
1672 | .Nm openssl errstr | 1676 | .Nm openssl errstr |
@@ -2326,6 +2330,7 @@ to each password hash. | |||
2326 | .Op Fl noout | 2330 | .Op Fl noout |
2327 | .Op Fl out Ar file | 2331 | .Op Fl out Ar file |
2328 | .Op Fl outform Cm der | pem | 2332 | .Op Fl outform Cm der | pem |
2333 | .Op Fl print | ||
2329 | .Op Fl print_certs | 2334 | .Op Fl print_certs |
2330 | .Op Fl text | 2335 | .Op Fl text |
2331 | .nr nS 0 | 2336 | .nr nS 0 |
@@ -2352,6 +2357,8 @@ The output to write to, | |||
2352 | or standard output if not specified. | 2357 | or standard output if not specified. |
2353 | .It Fl outform Cm der | pem | 2358 | .It Fl outform Cm der | pem |
2354 | The output format. | 2359 | The output format. |
2360 | .It Fl print | ||
2361 | Print the ASN.1 representation of PKCS#7 structure. | ||
2355 | .It Fl print_certs | 2362 | .It Fl print_certs |
2356 | Print any certificates or CRLs contained in the file, | 2363 | Print any certificates or CRLs contained in the file, |
2357 | preceded by their subject and issuer names in a one-line format. | 2364 | preceded by their subject and issuer names in a one-line format. |