projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dc43f08
)
doc: note the default iteration count for PBKDF2 in the enc command
author
Pauli
<pauli@openssl.org>
Wed, 8 Mar 2023 23:17:53 +0000
(10:17 +1100)
committer
Pauli
<pauli@openssl.org>
Sun, 19 Mar 2023 21:24:26 +0000
(08:24 +1100)
Fixes #20466
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/20471)
doc/man1/openssl-enc.pod.in
patch
|
blob
|
history
diff --git
a/doc/man1/openssl-enc.pod.in
b/doc/man1/openssl-enc.pod.in
index be66d07f5d517d52ae99823ec67e696f9a5a04b9..84d67361f82e47db9d1544308b51911ba62eaca5 100644
(file)
--- a/
doc/man1/openssl-enc.pod.in
+++ b/
doc/man1/openssl-enc.pod.in
@@
-129,7
+129,8
@@
This option enables the use of PBKDF2 algorithm to derive the key.
=item B<-pbkdf2>
-Use PBKDF2 algorithm with default iteration count unless otherwise specified.
+Use PBKDF2 algorithm with a default iteration count of 10000
+unless otherwise specified by the B<-iter> command line option.
=item B<-nosalt>