From: Jeffrey Walton Date: Sun, 7 Jun 2015 01:52:56 +0000 (-0400) Subject: Explicitly mention PKCS5_PBKDF2_HMAC in EVP doc. X-Git-Tag: OpenSSL_1_0_2b~23 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=31909e796878a8f546b290916e5bb53fbbfc91f4;p=oweals%2Fopenssl.git Explicitly mention PKCS5_PBKDF2_HMAC in EVP doc. Signed-off-by: Rich Salz Reviewed-by: Matt Caswell (cherry picked from commit 82c4d793181058de9fde5c9088fd400fdb7e01e3) --- 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 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