diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2015-06-06 21:52:56 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-06-08 20:21:23 -0400 |
| commit | 31909e796878a8f546b290916e5bb53fbbfc91f4 (patch) | |
| tree | 2215beee44f19c70dffd4bfcd0c5308945d0ccb5 /doc/crypto | |
| parent | 34cdff92e97b3d65e8f1b6d60779107c99d3a931 (diff) | |
Explicitly mention PKCS5_PBKDF2_HMAC in EVP doc.
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 82c4d793181058de9fde5c9088fd400fdb7e01e3)
Diffstat (limited to 'doc/crypto')
| -rw-r--r-- | doc/crypto/EVP_BytesToKey.pod | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/crypto/EVP_BytesToKey.pod b/doc/crypto/EVP_BytesToKey.pod index 5d6059528e..a9b6bb0c73 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 |