[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  31909e796878a8f546b290916e5bb53fbbfc91f4 (commit)
      from  34cdff92e97b3d65e8f1b6d60779107c99d3a931 (commit)


- Log -----------------------------------------------------------------
commit 31909e796878a8f546b290916e5bb53fbbfc91f4
Author: Jeffrey Walton <noloader at gmail.com>
Date:   Sat Jun 6 21:52:56 2015 -0400

    Explicitly mention PKCS5_PBKDF2_HMAC in EVP doc.
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 82c4d793181058de9fde5c9088fd400fdb7e01e3)

-----------------------------------------------------------------------

Summary of changes:
 doc/crypto/EVP_BytesToKey.pod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/crypto/EVP_BytesToKey.pod b/doc/crypto/EVP_BytesToKey.pod
index 5d60595..a9b6bb0 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