summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2015-06-06 21:52:56 -0400
committerRich Salz <rsalz@openssl.org>2015-06-08 20:20:24 -0400
commit82c4d793181058de9fde5c9088fd400fdb7e01e3 (patch)
treee1a4cc55d7d132de332e25a1c86dc44fc937e72d /doc
parent1dece95168a32fb11cc671a7571807e04b47ed11 (diff)
Explicitly mention PKCS5_PBKDF2_HMAC in EVP doc.
Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/crypto/EVP_BytesToKey.pod4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/crypto/EVP_BytesToKey.pod b/doc/crypto/EVP_BytesToKey.pod
index e6df57df60..dca5239ecc 100644
--- 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