diff options
| author |   beck <beck@openbsd.org> | 2019-01-18 03:54:02 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2019-01-18 03:54:02 +0000 |
| commit | fac3f74c3e94d07740edda4bcbdcc1763b3a18c2 (patch) | |
| tree | fdb1208075b2a55de72c49be6d28b2226126c4fa | |
| parent | Change the default digest type to sha256, and add support for (diff) | |
| download | wireguard-openbsd-fac3f74c3e94d07740edda4bcbdcc1763b3a18c2.tar.xz wireguard-openbsd-fac3f74c3e94d07740edda4bcbdcc1763b3a18c2.zip | |
Add the -iter and -pbkdf2 argumenst to enc
| -rw-r--r-- | usr.bin/openssl/openssl.1 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/usr.bin/openssl/openssl.1 b/usr.bin/openssl/openssl.1 index 3cd9df44e56..9af977a04a4 100644 --- a/usr.bin/openssl/openssl.1 +++ b/usr.bin/openssl/openssl.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: openssl.1,v 1.95 2018/11/01 07:01:42 tb Exp $ +.\" $OpenBSD: openssl.1,v 1.96 2019/01/18 03:54:02 beck Exp $ .\" ==================================================================== .\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. .\" @@ -110,7 +110,7 @@ .\" copied and put under another distribution licence .\" [including the GNU Public Licence.] .\" -.Dd $Mdocdate: November 1 2018 $ +.Dd $Mdocdate: January 18 2019 $ .Dt OPENSSL 1 .Os .Sh NAME @@ -1495,6 +1495,7 @@ Print the EC parameters in plain text. .Op Fl debug .Op Fl in Ar file .Op Fl iv Ar IV +.Op Fl iter Ar iterations .Op Fl K Ar key .Op Fl k Ar password .Op Fl kfile Ar file @@ -1504,6 +1505,7 @@ Print the EC parameters in plain text. .Op Fl nosalt .Op Fl out Ar file .Op Fl pass Ar arg +.Op Fl pbkdf2 .Op Fl S Ar salt .Op Fl salt .nr nS 0 @@ -1563,6 +1565,10 @@ 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 @@ -1626,6 +1632,9 @@ don't do any encryption or decryption. 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 +the default of 10000 iterations. .It Fl S Ar salt The actual .Ar salt |