diff options
author | Jason McIntyre <jmc@cvs.openbsd.org> | 2019-01-18 07:11:52 +0000 |
---|---|---|
committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2019-01-18 07:11:52 +0000 |
commit | 99e58785c98838338a78f35f2e504e904c4e0e1d (patch) | |
tree | 99e55da5f2ad5e97f9848f05654b9ea93c30263b /usr.bin/openssl/openssl.1 | |
parent | cd982a7bc3bf6a935a3f1f2b735e20a344805f02 (diff) |
tweak previous;
Diffstat (limited to 'usr.bin/openssl/openssl.1')
-rw-r--r-- | usr.bin/openssl/openssl.1 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/openssl/openssl.1 b/usr.bin/openssl/openssl.1 index 9af977a04a4..1a116c44778 100644 --- a/usr.bin/openssl/openssl.1 +++ b/usr.bin/openssl/openssl.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: openssl.1,v 1.96 2019/01/18 03:54:02 beck Exp $ +.\" $OpenBSD: openssl.1,v 1.97 2019/01/18 07:11:51 jmc Exp $ .\" ==================================================================== .\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. .\" @@ -1494,8 +1494,8 @@ Print the EC parameters in plain text. .Op Fl bufsize Ar number .Op Fl debug .Op Fl in Ar file -.Op Fl iv Ar IV .Op Fl iter Ar iterations +.Op Fl iv Ar IV .Op Fl K Ar key .Op Fl k Ar password .Op Fl kfile Ar file @@ -1551,6 +1551,10 @@ This is the default. .It Fl in Ar file The input file to read from, or standard input if not specified. +.It Fl iter Ar iterations +Use the pbkdf2 key derivation function, with +.Ar iterations +as the number of iterations. .It Fl iv Ar IV The actual .Ar IV @@ -1565,10 +1569,6 @@ option, the IV must explicitly be defined. When a password is being specified using one of the other options, the IV is generated from this password. -.It Fl iter Ar iterations -specifies the use of the pbkdf2 key derivation function, using -.Ar iterations -as the number of iterations. .It Fl K Ar key The actual .Ar key @@ -1633,7 +1633,7 @@ Print out the salt, key, and IV used. .It Fl pass Ar arg The password source. .It Fl pbkdf2 -specifies the use of the pbkdf2 key derivation function, using +Use the pbkdf2 key derivation function, with the default of 10000 iterations. .It Fl S Ar salt The actual |