Add evp_test fixes.
authorShane Lontis <shane.lontis@oracle.com>
Fri, 7 Aug 2020 04:29:00 +0000 (14:29 +1000)
committerShane Lontis <shane.lontis@oracle.com>
Fri, 7 Aug 2020 04:29:00 +0000 (14:29 +1000)
commit5ccada09aae0cf846d3381a161d3eb20d4d9abfd
tree39fc4e655a53c146bc6a8fcde3f0746c56a97a1c
parent64827f407b0b603f585d7fadfd7e61a60ed7a45b
Add evp_test fixes.

Changed many tests so they also test fips (and removed 'availablein = default' from some tests).
Seperated the monolithic evppkey.txt file into smaller maintainable groups.
Changed the availablein option so it must be first - this then skips the entire test before any fetching happens.
Changed the code so that all the OPENSSL_NO_XXXX tests are done in code via methods such as is_cipher_disabled(alg),
before the fetch happens.
Added missing libctx's found by adding a libctx to test_evp.
Broke up large data files for cipher, kdf's and mac's into smaller pieces so they no longer need 'AvailableIn = default'
Added missing algorithm aliases for cipher/digests to the providers.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12236)
73 files changed:
crypto/ec/ec_pmeth.c
crypto/ec/ecdh_kdf.c
crypto/evp/p5_crpt2.c
crypto/evp/pbe_scrypt.c
crypto/evp/pkey_kdf.c
crypto/sm2/sm2_crypt.c
crypto/sm2/sm2_pmeth.c
crypto/sm2/sm2_sign.c
include/crypto/ec.h
include/crypto/evp.h
providers/defltprov.c
providers/fips/fipsprov.c
providers/implementations/exchange/ecdh_exch.c
providers/implementations/kdfs/scrypt.c
providers/legacyprov.c
test/evp_test.c
test/recipes/30-test_evp.t
test/recipes/30-test_evp_data/evpcase.txt [deleted file]
test/recipes/30-test_evp_data/evpciph_aes_ccm_cavs.txt [moved from test/recipes/30-test_evp_data/evpccmcavs.txt with 99% similarity]
test/recipes/30-test_evp_data/evpciph_aes_common.txt [moved from test/recipes/30-test_evp_data/evpciph.txt with 58% similarity]
test/recipes/30-test_evp_data/evpciph_aes_cts1.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpciph_aes_cts23.txt [moved from test/recipes/30-test_evp_data/evpciph_aes_cts.txt with 55% similarity]
test/recipes/30-test_evp_data/evpciph_aes_ocb.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpciph_aes_siv.txt [moved from test/recipes/30-test_evp_data/evpaessiv.txt with 94% similarity]
test/recipes/30-test_evp_data/evpciph_aria.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpciph_bf.txt
test/recipes/30-test_evp_data/evpciph_camellia.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpciph_chacha.txt
test/recipes/30-test_evp_data/evpciph_des.txt
test/recipes/30-test_evp_data/evpciph_des3_common.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpciph_sm4.txt
test/recipes/30-test_evp_data/evpencod.txt
test/recipes/30-test_evp_data/evpkdf_hkdf.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpkdf_krb5.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpkdf_pbkdf2.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpkdf_scrypt.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpkdf_ss.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpkdf_ssh.txt [moved from test/recipes/30-test_evp_data/evpkdf.txt with 86% similarity]
test/recipes/30-test_evp_data/evpkdf_tls11_prf.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpkdf_tls12_prf.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpkdf_x942.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpkdf_x963.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpmac.txt [deleted file]
test/recipes/30-test_evp_data/evpmac_blake.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpmac_common.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpmac_poly1305.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpmac_siphash.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpmd_blake.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpmd_md.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpmd_md2.txt [deleted file]
test/recipes/30-test_evp_data/evpmd_mdc2.txt
test/recipes/30-test_evp_data/evpmd_ripemd.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpmd_sha.txt [moved from test/recipes/30-test_evp_data/evpdigest.txt with 59% similarity]
test/recipes/30-test_evp_data/evpmd_sm3.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evpmd_whirlpool.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppbe_pbkdf2.txt [moved from test/recipes/30-test_evp_data/evppbe.txt with 61% similarity]
test/recipes/30-test_evp_data/evppbe_pkcs12.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppbe_scrypt.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppkey_brainpool.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppkey_dsa.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppkey_ecc.txt
test/recipes/30-test_evp_data/evppkey_ecdh.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppkey_ecdsa.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppkey_ecx.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppkey_ffdhe.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppkey_kas.txt [moved from test/recipes/30-test_evp_data/evppkey.txt with 55% similarity]
test/recipes/30-test_evp_data/evppkey_kdf_hkdf.txt [moved from test/recipes/30-test_evp_data/evppkey_kdf.txt with 62% similarity]
test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppkey_kdf_tls1_prf.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppkey_mismatch.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppkey_rsa.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evppkey_sm2.txt [new file with mode: 0644]
test/recipes/30-test_evp_data/evprand.txt