diff options
author | jmc <> | 2019-01-18 07:11:51 +0000 |
---|---|---|
committer | jmc <> | 2019-01-18 07:11:51 +0000 |
commit | 0c5d69513c289e9ce0ad1d05ba2604b40af21910 (patch) | |
tree | 13c51a5c08ac068f863dd7d7ee1674662973d663 /src | |
parent | fb4a09a2789629d9170734e4abf21db26759af09 (diff) | |
download | openbsd-0c5d69513c289e9ce0ad1d05ba2604b40af21910.tar.gz openbsd-0c5d69513c289e9ce0ad1d05ba2604b40af21910.tar.bz2 openbsd-0c5d69513c289e9ce0ad1d05ba2604b40af21910.zip |
tweak previous;
Diffstat (limited to 'src')
-rw-r--r-- | src/usr.bin/openssl/openssl.1 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1 index 9af977a04a..1a116c4477 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.96 2019/01/18 03:54:02 beck Exp $ | 1 | .\" $OpenBSD: openssl.1,v 1.97 2019/01/18 07:11:51 jmc 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 | .\" |
@@ -1494,8 +1494,8 @@ Print the EC parameters in plain text. | |||
1494 | .Op Fl bufsize Ar number | 1494 | .Op Fl bufsize Ar number |
1495 | .Op Fl debug | 1495 | .Op Fl debug |
1496 | .Op Fl in Ar file | 1496 | .Op Fl in Ar file |
1497 | .Op Fl iv Ar IV | ||
1498 | .Op Fl iter Ar iterations | 1497 | .Op Fl iter Ar iterations |
1498 | .Op Fl iv Ar IV | ||
1499 | .Op Fl K Ar key | 1499 | .Op Fl K Ar key |
1500 | .Op Fl k Ar password | 1500 | .Op Fl k Ar password |
1501 | .Op Fl kfile Ar file | 1501 | .Op Fl kfile Ar file |
@@ -1551,6 +1551,10 @@ This is the default. | |||
1551 | .It Fl in Ar file | 1551 | .It Fl in Ar file |
1552 | The input file to read from, | 1552 | The input file to read from, |
1553 | or standard input if not specified. | 1553 | or standard input if not specified. |
1554 | .It Fl iter Ar iterations | ||
1555 | Use the pbkdf2 key derivation function, with | ||
1556 | .Ar iterations | ||
1557 | as the number of iterations. | ||
1554 | .It Fl iv Ar IV | 1558 | .It Fl iv Ar IV |
1555 | The actual | 1559 | The actual |
1556 | .Ar IV | 1560 | .Ar IV |
@@ -1565,10 +1569,6 @@ option, | |||
1565 | the IV must explicitly be defined. | 1569 | the IV must explicitly be defined. |
1566 | When a password is being specified using one of the other options, | 1570 | When a password is being specified using one of the other options, |
1567 | the IV is generated from this password. | 1571 | the IV is generated from this password. |
1568 | .It Fl iter Ar iterations | ||
1569 | specifies the use of the pbkdf2 key derivation function, using | ||
1570 | .Ar iterations | ||
1571 | as the number of iterations. | ||
1572 | .It Fl K Ar key | 1572 | .It Fl K Ar key |
1573 | The actual | 1573 | The actual |
1574 | .Ar key | 1574 | .Ar key |
@@ -1633,7 +1633,7 @@ Print out the salt, key, and IV used. | |||
1633 | .It Fl pass Ar arg | 1633 | .It Fl pass Ar arg |
1634 | The password source. | 1634 | The password source. |
1635 | .It Fl pbkdf2 | 1635 | .It Fl pbkdf2 |
1636 | specifies the use of the pbkdf2 key derivation function, using | 1636 | Use the pbkdf2 key derivation function, with |
1637 | the default of 10000 iterations. | 1637 | the default of 10000 iterations. |
1638 | .It Fl S Ar salt | 1638 | .It Fl S Ar salt |
1639 | The actual | 1639 | The actual |