diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-08-07 14:29:00 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-08-07 14:29:00 +1000 |
| commit | 5ccada09aae0cf846d3381a161d3eb20d4d9abfd (patch) | |
| tree | 39fc4e655a53c146bc6a8fcde3f0746c56a97a1c /providers/legacyprov.c | |
| parent | 64827f407b0b603f585d7fadfd7e61a60ed7a45b (diff) | |
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)
Diffstat (limited to 'providers/legacyprov.c')
| -rw-r--r-- | providers/legacyprov.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/providers/legacyprov.c b/providers/legacyprov.c index adf7c82374..40d24873a2 100644 --- a/providers/legacyprov.c +++ b/providers/legacyprov.c @@ -111,9 +111,9 @@ static const OSSL_ALGORITHM legacy_ciphers[] = { #endif /* OPENSSL_NO_SEED */ #ifndef OPENSSL_NO_RC2 ALG("RC2-ECB", rc2128ecb_functions), - ALG("RC2-CBC", rc2128cbc_functions), - ALG("RC2-40-CBC", rc240cbc_functions), - ALG("RC2-64-CBC", rc264cbc_functions), + ALG("RC2-CBC:RC2:RC2-128", rc2128cbc_functions), + ALG("RC2-40-CBC:RC2-40", rc240cbc_functions), + ALG("RC2-64-CBC:RC2-64", rc264cbc_functions), ALG("RC2-CFB", rc2128cfb128_functions), ALG("RC2-OFB", rc2128ofb128_functions), #endif /* OPENSSL_NO_RC2 */ @@ -126,7 +126,7 @@ static const OSSL_ALGORITHM legacy_ciphers[] = { #endif /* OPENSSL_NO_RC4 */ #ifndef OPENSSL_NO_RC5 ALG("RC5-ECB", rc5128ecb_functions), - ALG("RC5-CBC", rc5128cbc_functions), + ALG("RC5-CBC:RC5", rc5128cbc_functions), ALG("RC5-OFB", rc5128ofb64_functions), ALG("RC5-CFB", rc5128cfb64_functions), #endif /* OPENSSL_NO_RC5 */ |