From 42ef36c6813822962aff009ee1ca5eaf04d6c5c7 Mon Sep 17 00:00:00 2001 From: miod <> Date: Fri, 11 Jul 2014 16:18:14 +0000 Subject: Huge documentation update for libcrypto and libssl, mostly from Matt Caswell, Jeff Trawick, Jean-Paul Calderone, Michal Bozon, Jeffrey Walton and Rich Salz, via OpenSSL trunk (with some parts not applying to us, such as SSLv2 support, at least partially removed). --- src/lib/libcrypto/doc/EVP_BytesToKey.pod | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/lib/libcrypto/doc/EVP_BytesToKey.pod') diff --git a/src/lib/libcrypto/doc/EVP_BytesToKey.pod b/src/lib/libcrypto/doc/EVP_BytesToKey.pod index 0ea7d55c0f..fe4c0a9194 100644 --- a/src/lib/libcrypto/doc/EVP_BytesToKey.pod +++ b/src/lib/libcrypto/doc/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 PKCS#5 -v2.0 for key derivation. +Newer applications should use more standard algorithms such as PBKDF2 as +defined in PKCS#5v2.1 for key derivation. =head1 KEY DERIVATION ALGORITHM @@ -60,6 +60,7 @@ EVP_BytesToKey() returns the size of the derived key in bytes. =head1 SEE ALSO L, L, +L, L =head1 HISTORY -- cgit v1.2.3-55-g6feb