[openssl-commits] [openssl] master update

Rich Salz rsalz at openssl.org
Tue Jun 9 00:20:33 UTC 2015

The branch master has been updated
       via  82c4d793181058de9fde5c9088fd400fdb7e01e3 (commit)
      from  1dece95168a32fb11cc671a7571807e04b47ed11 (commit)

- Log -----------------------------------------------------------------
commit 82c4d793181058de9fde5c9088fd400fdb7e01e3
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>


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 e6df57d..dca5239 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.

More information about the openssl-commits mailing list