Add EVP_KDF-X942 to the fips module
authorShane Lontis <shane.lontis@oracle.com>
Mon, 16 Nov 2020 02:42:18 +0000 (12:42 +1000)
committerShane Lontis <shane.lontis@oracle.com>
Wed, 2 Dec 2020 02:15:05 +0000 (12:15 +1000)
commit89cccbea51fa52a1e4784a9ece35d96e4dcbfd30
tree89cb59183ed18f1e5dd5cb86fed810b04cce466e
parent8018352457cf9c98ce59f1e591fcd69f2153b649
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)
22 files changed:
crypto/dh/dh_ctrl.c
crypto/dh/dh_kdf.c
crypto/err/openssl.txt
doc/man1/openssl-kdf.pod.in
doc/man7/EVP_KDF-X942-ASN1.pod [new file with mode: 0644]
doc/man7/EVP_KDF-X942-CONCAT.pod [new file with mode: 0644]
doc/man7/EVP_KDF-X942.pod [deleted file]
doc/man7/OSSL_PROVIDER-FIPS.pod
doc/man7/OSSL_PROVIDER-default.pod
include/openssl/core_names.h
providers/common/include/prov/providercommonerr.h
providers/common/provider_err.c
providers/defltprov.c
providers/fips/fipsprov.c
providers/implementations/exchange/dh_exch.c
providers/implementations/include/prov/implementations.h
providers/implementations/kdfs/x942kdf.c
test/evp_kdf_test.c
test/evp_test.c
test/recipes/30-test_evp.t
test/recipes/30-test_evp_data/evpkdf_x942.txt
test/recipes/30-test_evp_data/evpkdf_x963.txt