From: Pauli Date: Sun, 15 Sep 2019 23:07:32 +0000 (+1000) Subject: Cleanup KDF section 1 documentation. X-Git-Tag: openssl-3.0.0-alpha1~1332 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=54488bd914ee344d55dc75d9df71ce9a5ad3da49;p=oweals%2Fopenssl.git Cleanup KDF section 1 documentation. Remove reference to EVP_KDF_ctrl_str and replace it with EVP_KDF_CTX_set_params. Add missing links, and specify two extra KDFs. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9905) --- diff --git a/doc/man1/openssl-kdf.pod b/doc/man1/openssl-kdf.pod index a2b0f25d25..2b14eaadc4 100644 --- a/doc/man1/openssl-kdf.pod +++ b/doc/man1/openssl-kdf.pod @@ -42,9 +42,9 @@ Output the derived key in binary form. Uses hexadecimal text format if not speci =item B<-kdfopt> I Passes options to the KDF algorithm. -A comprehensive list of controls can be found in the EVP_KDF_CTX implementation -documentation. -Common control strings used by EVP_KDF_ctrl_str() are: +A comprehensive list of parameters can be found in the EVP_KDF_CTX +implementation documentation. +Common parameter names used by EVP_KDF_CTX_set_params() are: =over 4 @@ -82,7 +82,8 @@ To see the list of supported digests, use the command I. =item I Specifies the name of a supported KDF algorithm which will be used. -The supported algorithms names are TLS1-PRF, HKDF, SSKDF, PBKDF2, SSHKDF and id-scrypt. +The supported algorithms names include TLS1-PRF, HKDF, SSKDF, PBKDF2, +SSHKDF, X942KDF, X963KDF and id-scrypt. =back @@ -143,14 +144,16 @@ used when building OpenSSL. =head1 SEE ALSO L, -L +L, L, -L -L -L -L -L -L +L, +L, +L, +L, +L, +L, +L, +L =head1 HISTORY