projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
34cdff9
)
Explicitly mention PKCS5_PBKDF2_HMAC in EVP doc.
author
Jeffrey Walton
<noloader@gmail.com>
Sun, 7 Jun 2015 01:52:56 +0000
(21:52 -0400)
committer
Rich Salz
<rsalz@openssl.org>
Tue, 9 Jun 2015 00:21:23 +0000
(20:21 -0400)
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit
82c4d793181058de9fde5c9088fd400fdb7e01e3
)
doc/crypto/EVP_BytesToKey.pod
patch
|
blob
|
history
diff --git
a/doc/crypto/EVP_BytesToKey.pod
b/doc/crypto/EVP_BytesToKey.pod
index 5d6059528e6d430ab8d5177de429361998b7d745..a9b6bb0c731fb54f28e7c7ef2145ae1b2d159224 100644
(file)
--- a/
doc/crypto/EVP_BytesToKey.pod
+++ b/
doc/crypto/EVP_BytesToKey.pod
@@
-36,8
+36,8
@@
If the total key and IV length is less than the digest length and
B<MD5> is used then the derivation algorithm is compatible with PKCS#5 v1.5
otherwise a non standard extension is used to derive the extra data.
-Newer applications should use
more standard algorithms
such as PBKDF2 as
-defined in PKCS#5v2.1
for key derivation
.
+Newer applications should use
a more modern algorithm
such as PBKDF2 as
+defined in PKCS#5v2.1
and provided by PKCS5_PBKDF2_HMAC
.
=head1 KEY DERIVATION ALGORITHM