diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-11-16 12:42:18 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-12-02 12:15:05 +1000 |
| commit | 89cccbea51fa52a1e4784a9ece35d96e4dcbfd30 (patch) | |
| tree | 89cb59183ed18f1e5dd5cb86fed810b04cce466e /doc/man1/openssl-kdf.pod.in | |
| parent | 8018352457cf9c98ce59f1e591fcd69f2153b649 (diff) | |
Add EVP_KDF-X942 to the fips module
The X942 KDF had been modified so that it supports all optional fields - not
just the fields used by CMS.
As there are 2 types of KDF for X942 - this has been made a bit clearer
by adding an X942KDF-ASN1 alias. X942KDF-CONCAT has also been added as an
alias of X963KDF.
This work was instigated as a result of the ACVP tests optionally being
able to use keybits for the supp_pubinfo field.
Setting the parameter OSSL_KDF_PARAM_X942_USE_KEYBITS to 0 allows this
to be disabled.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13418)
Diffstat (limited to 'doc/man1/openssl-kdf.pod.in')
| -rw-r--r-- | doc/man1/openssl-kdf.pod.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/man1/openssl-kdf.pod.in b/doc/man1/openssl-kdf.pod.in index 9c585325ba..3d532ebfc6 100644 --- a/doc/man1/openssl-kdf.pod.in +++ b/doc/man1/openssl-kdf.pod.in @@ -87,7 +87,7 @@ To see the list of supported digests, use the command I<list -digest-commands>. Specifies the name of a supported KDF algorithm which will be used. The supported algorithms names include TLS1-PRF, HKDF, SSKDF, PBKDF2, -SSHKDF, X942KDF, X963KDF and SCRYPT. +SSHKDF, X942KDF-ASN1, X942KDF-CONCAT, X963KDF and SCRYPT. =back @@ -156,7 +156,8 @@ L<EVP_KDF-PBKDF2(7)>, L<EVP_KDF-HKDF(7)>, L<EVP_KDF-SS(7)>, L<EVP_KDF-SSHKDF(7)>, -L<EVP_KDF-X942(7)>, +L<EVP_KDF-X942-ASN1(7)>, +L<EVP_KDF-X942-CONCAT(7)>, L<EVP_KDF-X963(7)> =head1 HISTORY |