aboutsummaryrefslogtreecommitdiff
path: root/openssl/doc/crypto/EVP_BytesToKey.pod
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-06-15 20:18:50 +0200
committerMike DePaulo <mikedep333@gmail.com>2015-06-22 01:16:46 -0400
commit36da4a2e0e43928a29ac2ee5c55bf681e90e2f42 (patch)
tree92633e1022d705c72d0f97315891e719648dd17e /openssl/doc/crypto/EVP_BytesToKey.pod
parentbec4be4c48239613ed1c704ae71bf08754eef711 (diff)
downloadvcxsrv-release/external-1.17.0.0-x.tar.gz
vcxsrv-release/external-1.17.0.0-x.tar.bz2
vcxsrv-release/external-1.17.0.0-x.zip
Update to openssl-1.0.2crelease/external-1.17.0.0-x
Diffstat (limited to 'openssl/doc/crypto/EVP_BytesToKey.pod')
-rw-r--r--openssl/doc/crypto/EVP_BytesToKey.pod4
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/doc/crypto/EVP_BytesToKey.pod b/openssl/doc/crypto/EVP_BytesToKey.pod
index 5d6059528..a9b6bb0c7 100644
--- a/openssl/doc/crypto/EVP_BytesToKey.pod
+++ b/openssl/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