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 /test/recipes/30-test_evp.t | |
| 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 'test/recipes/30-test_evp.t')
| -rw-r--r-- | test/recipes/30-test_evp.t | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t index 9739465f01..df343d4109 100644 --- a/test/recipes/30-test_evp.t +++ b/test/recipes/30-test_evp.t @@ -48,6 +48,7 @@ my @files = qw( evpkdf_ss.txt evpkdf_ssh.txt evpkdf_tls12_prf.txt + evpkdf_x942.txt evpkdf_x963.txt evpmac_common.txt evpmd_sha.txt @@ -89,7 +90,6 @@ my @defltfiles = qw( evpkdf_krb5.txt evpkdf_scrypt.txt evpkdf_tls11_prf.txt - evpkdf_x942.txt evpmac_blake.txt evpmac_poly1305.txt evpmac_siphash.txt |