summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/usr.bin/openssl/openssl.114
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
1552The input file to read from, 1552The input file to read from,
1553or standard input if not specified. 1553or standard input if not specified.
1554.It Fl iter Ar iterations
1555Use the pbkdf2 key derivation function, with
1556.Ar iterations
1557as the number of iterations.
1554.It Fl iv Ar IV 1558.It Fl iv Ar IV
1555The actual 1559The actual
1556.Ar IV 1560.Ar IV
@@ -1565,10 +1569,6 @@ option,
1565the IV must explicitly be defined. 1569the IV must explicitly be defined.
1566When a password is being specified using one of the other options, 1570When a password is being specified using one of the other options,
1567the IV is generated from this password. 1571the IV is generated from this password.
1568.It Fl iter Ar iterations
1569specifies the use of the pbkdf2 key derivation function, using
1570.Ar iterations
1571as the number of iterations.
1572.It Fl K Ar key 1572.It Fl K Ar key
1573The actual 1573The 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
1634The password source. 1634The password source.
1635.It Fl pbkdf2 1635.It Fl pbkdf2
1636specifies the use of the pbkdf2 key derivation function, using 1636Use the pbkdf2 key derivation function, with
1637the default of 10000 iterations. 1637the default of 10000 iterations.
1638.It Fl S Ar salt 1638.It Fl S Ar salt
1639The actual 1639The actual