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/defltprov.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/defltprov.c')
| -rw-r--r-- | providers/defltprov.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c index fa2fadbc95..0ee717acac 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -95,7 +95,7 @@ static int deflt_get_params(void *provctx, OSSL_PARAM params[]) */ static const OSSL_ALGORITHM deflt_digests[] = { /* Our primary name:NIST name[:our older names] */ - { "SHA1:SHA-1", "provider=default", sha1_functions }, + { "SHA1:SHA-1:SSL3-SHA1", "provider=default", sha1_functions }, { "SHA2-224:SHA-224:SHA224", "provider=default", sha224_functions }, { "SHA2-256:SHA-256:SHA256", "provider=default", sha256_functions }, { "SHA2-384:SHA-384:SHA384", "provider=default", sha384_functions }, @@ -139,7 +139,7 @@ static const OSSL_ALGORITHM deflt_digests[] = { #endif /* OPENSSL_NO_SM3 */ #ifndef OPENSSL_NO_MD5 - { "MD5", "provider=default", md5_functions }, + { "MD5:SSL3-MD5", "provider=default", md5_functions }, { "MD5-SHA1", "provider=default", md5_sha1_functions }, #endif /* OPENSSL_NO_MD5 */ @@ -151,9 +151,9 @@ static const OSSL_ALGORITHM_CAPABLE deflt_ciphers[] = { ALG("AES-256-ECB", aes256ecb_functions), ALG("AES-192-ECB", aes192ecb_functions), ALG("AES-128-ECB", aes128ecb_functions), - ALG("AES-256-CBC", aes256cbc_functions), - ALG("AES-192-CBC", aes192cbc_functions), - ALG("AES-128-CBC", aes128cbc_functions), + ALG("AES-256-CBC:AES256", aes256cbc_functions), + ALG("AES-192-CBC:AES192", aes192cbc_functions), + ALG("AES-128-CBC:AES128", aes128cbc_functions), ALG("AES-128-CBC-CTS", aes128cbc_cts_functions), ALG("AES-192-CBC-CTS", aes192cbc_cts_functions), ALG("AES-256-CBC-CTS", aes256cbc_cts_functions), |